[SCM] xcfa/master: Merge commit 'upstream/4.0.5_beta2'

[alessio at users.alioth.debian.org]

Imported Upstream version 4.0.5~beta2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 29110274c8ba708209f6994a6d5d7b5b4ec49578
X-Git-Newrev: 0163e9d6c8ab05887646cdefc30041ff8c352cc9

The following commit has been merged in the master branch:
commit da861a044a4ca65320302d510c30fb67e67aa73e
Merge: 29110274c8ba708209f6994a6d5d7b5b4ec49578 47c8ef56f60ca8ee745de57d2dc55acb0c48957f
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Mar 29 11:52:23 2011 +0200

    Merge commit 'upstream/4.0.5_beta2'


-- 
xcfa packaging