Merge commit 'upstream/0.1.8'
authorCharles Plessy <plessy@debian.org>
Tue, 13 Jul 2010 12:02:50 +0000 (21:02 +0900)
committerCharles Plessy <plessy@debian.org>
Tue, 13 Jul 2010 12:02:50 +0000 (21:02 +0900)

Trivial merge