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

[alessio at users.alioth.debian.org]

Imported Upstream version 4.2.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: 1d1443f5dd213c5830779d333cdbdd5ba68bf2d0
X-Git-Newrev: 967cdbf7699f04a16e8d90acb88708c103e84868

The following commit has been merged in the master branch:
commit 967cdbf7699f04a16e8d90acb88708c103e84868
Merge: 1d1443f5dd213c5830779d333cdbdd5ba68bf2d0 d1386574b370b7ccb3ebc7aecc6a1de3d2daedf9
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jul 13 02:08:11 2011 +0200

    Merge commit 'upstream/4.2.0'


-- 
xcfa packaging