[SCM] pd-zexy/master: Merge commit 'upstream/2.2.4'

[zmoelnig-guest at users.alioth.debian.org]

Imported Upstream version 2.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: 2e8126472f0eef6ecf43987679770bdb0b7ad93f
X-Git-Newrev: edf05c4041efb9b05c9c707ede658167aaf489fc

The following commit has been merged in the master branch:
commit a31d04f0536bd0c5bef29d226eec6818adc3cdc4
Merge: 2e8126472f0eef6ecf43987679770bdb0b7ad93f ca0118c9fceb739249faf1449e3f02ae76b46b3e
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Sep 27 16:15:31 2011 +0200

    Merge commit 'upstream/2.2.4'


-- 
pd-zexy packaging