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

[alessio at users.alioth.debian.org]

Imported Upstream version 4.0.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8ea6d5f1dd8bc705c28671e4663730c471d40d47
X-Git-Newrev: 16a5d0526dedd6397bbb2014b48aef15e720341a

The following commit has been merged in the master branch:
commit 16a5d0526dedd6397bbb2014b48aef15e720341a
Merge: 8ea6d5f1dd8bc705c28671e4663730c471d40d47 f540aa0d6bfebafb5f0c1b4bee6281baf66c5580
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Mar 19 10:49:02 2011 +0100

    Merge commit 'upstream/4.0.4'


-- 
xcfa packaging