Merge commit 'upstream/0.1.16'
authorCharles Plessy <plessy@debian.org>
Sat, 7 May 2011 08:30:17 +0000 (17:30 +0900)
committerCharles Plessy <plessy@debian.org>
Sat, 7 May 2011 08:30:17 +0000 (17:30 +0900)

Trivial merge