[SCM] pd-pddp/master: Merge commit 'upstream/0.2'

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

Imported Upstream version 0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 859d29269a9dd43ed20ebca3d384d113e7df8b74
X-Git-Newrev: dd64618a94d28a7a430112d96093ac68eb1d6176

The following commit has been merged in the master branch:
commit a1ac40e0f735e6dc39e036dff479051e2ee20b05
Merge: 859d29269a9dd43ed20ebca3d384d113e7df8b74 05669d3273a43d9db2362393a315155a331e872b
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Thu Dec 29 14:29:10 2011 -0500

    Merge commit 'upstream/0.2'


-- 
pd-pddp packaging