Merge tag 'upstream/0.9.4+r4178.20120131'
authorgregor herrmann <gregoa@debian.org>
Tue, 31 Jan 2012 18:47:54 +0000 (19:47 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 31 Jan 2012 18:47:54 +0000 (19:47 +0100)
commit97dcc1bb6e8da4e3854f884690166d7356798fe5
tree41276e7be3f774f2e4d2e5c7c93de5a81331ed5c
parentcfe579bdfd45d0b6f7099f36ae3da3dfe87f1139
parent4637192d6ed9834ce1307b33e6a604dd5395ad0e
Merge tag 'upstream/0.9.4+r4178.20120131'

Upstream version 0.9.4+r4178.20120131