[SCM] pd-maxlib/master: Merge commit 'upstream/1.5.4'

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

Imported Upstream version 1.5.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: db5e088e144e329b9f566be591b70d2352ddcf93
X-Git-Newrev: 46e4c526d478f79411bbd6cb16e256d5b2657032

The following commit has been merged in the master branch:
commit 4ebf7e5fad5ba5698998ce356d5cad2ead1f07a8
Merge: db5e088e144e329b9f566be591b70d2352ddcf93 0570d0e7587c53135607dc84181d0980a965c5c5
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Wed Dec 28 21:20:38 2011 -0500

    Merge commit 'upstream/1.5.4'


-- 
pd-maxlib packaging