Merge commit 'upstream/0.6'
authorDominique Belhachemi <domibel@debian.org>
Fri, 16 Dec 2011 21:17:04 +0000 (16:17 -0500)
committerDominique Belhachemi <domibel@debian.org>
Fri, 16 Dec 2011 21:17:04 +0000 (16:17 -0500)

Trivial merge