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

[alessio at users.alioth.debian.org]

Imported Upstream version 4.2.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: 8be38146c2f051ce5058bef6a034d05d881a1d8c
X-Git-Newrev: 61bd32ac876f1aff8e86ec1cb78d0b3a54bcd279

The following commit has been merged in the master branch:
commit 61bd32ac876f1aff8e86ec1cb78d0b3a54bcd279
Merge: 8be38146c2f051ce5058bef6a034d05d881a1d8c 2cc7e318c56f1d55344b5ce7ccffc485e1739962
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Sep 3 10:14:15 2011 +0200

    Merge commit 'upstream/4.2.4'


-- 
xcfa packaging