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

[alessio at users.alioth.debian.org]

Imported Upstream version 4.0.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: 2f97167e793ace2bc03093f2f472573fee5773cc
X-Git-Newrev: 44ad037aa5c0f2d125148d9044011f1fa24541b2

The following commit has been merged in the master branch:
commit 6154c9d4b7cd40e3623d317293713c96cbc0b7ca
Merge: 2f97167e793ace2bc03093f2f472573fee5773cc 1b7ce868c879349728940df798a89390cbabd310
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 6 16:52:27 2010 +0100

    Merge commit 'upstream/4.0.0'


-- 
xcfa packaging