Merge commit 'upstream/0.1.17'
authorCharles Plessy <plessy@debian.org>
Mon, 11 Jul 2011 11:18:59 +0000 (20:18 +0900)
committerCharles Plessy <plessy@debian.org>
Mon, 11 Jul 2011 11:18:59 +0000 (20:18 +0900)

Trivial merge