[SCM] xcfa/master: Merge commit 'upstream/4.0.2'

[alessio at users.alioth.debian.org]

Imported Upstream version 4.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4833cb98506cebe8c8d0ee40b9c9d067348b84b9
X-Git-Newrev: 233cc8a79d7647d1b9d4a5bafcbcb3088cda9637

The following commit has been merged in the master branch:
commit 233cc8a79d7647d1b9d4a5bafcbcb3088cda9637
Merge: 4833cb98506cebe8c8d0ee40b9c9d067348b84b9 45fbfc8ca062274d96d60d5aee92abc4021ab4f2
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 4 09:36:11 2011 +0100

    Merge commit 'upstream/4.0.2'


-- 
xcfa packaging