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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit db46607779388a893f7e9cb07ba767cab32e5b33
Merge: f72424ad7653e12a64be102bd07e74dbf8fee30f 56ed314692d166ee5f6e12f8e2d2ade802ae508a
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jun 7 12:07:20 2011 +0200

    Merge commit 'upstream/4.1.0'


-- 
xcfa packaging