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

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

Imported Upstream version 2.2.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: edf05c4041efb9b05c9c707ede658167aaf489fc
X-Git-Newrev: 6365cf55aa4ee364d8c955ca1f587470ca3c7e86

The following commit has been merged in the master branch:
commit 43fe90fabb5b7242d196fc54658579629ee4b642
Merge: edf05c4041efb9b05c9c707ede658167aaf489fc 6bb0c31b498d7c94c1f12c0f0f29d2d3d0584f39
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Thu Sep 29 15:35:53 2011 +0200

    Merge commit 'upstream/2.2.5'


-- 
pd-zexy packaging