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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 315ef016e9f7e15d0a0032697b84764eefb534b1
Merge: 8e6dbcbb8a2dade9e2c8990b44479bf6ce978fd0 6d01ca1aabd7769876936c385229d76470e63d5d
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 2 17:05:32 2011 +0200

    Merge commit 'upstream/4.2.1'


-- 
xcfa packaging