Merge tag 'upstream/0.7'
authorDominique Belhachemi <domibel@debian.org>
Wed, 19 Dec 2012 04:09:02 +0000 (23:09 -0500)
committerDominique Belhachemi <domibel@debian.org>
Wed, 19 Dec 2012 04:09:02 +0000 (23:09 -0500)
Upstream version 0.7


Trivial merge