Merge remote-tracking branch 'debian/master'
authorWouter Verhelst <w@uter.be>
Wed, 20 Jul 2011 16:58:03 +0000 (18:58 +0200)
committerWouter Verhelst <w@uter.be>
Wed, 20 Jul 2011 16:58:03 +0000 (18:58 +0200)

Trivial merge