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

[alessio at users.alioth.debian.org]

Imported Upstream version 4.0.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6654bb0e3be7dfc3fb71bd5efc717be4ce14a1b8
X-Git-Newrev: 7c0aae548bec8e7c3f32bfe4b8a7264fdde6c4e7

The following commit has been merged in the master branch:
commit 7c0aae548bec8e7c3f32bfe4b8a7264fdde6c4e7
Merge: 6654bb0e3be7dfc3fb71bd5efc717be4ce14a1b8 c0d06ce44143910bbf6e5fddebbf665c828d355a
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 30 11:25:25 2011 +0200

    Merge commit 'upstream/4.0.5'


-- 
xcfa packaging