Merge commit 'upstream/0.1.9'
authorCharles Plessy <plessy@debian.org>
Mon, 1 Nov 2010 09:45:04 +0000 (18:45 +0900)
committerCharles Plessy <plessy@debian.org>
Mon, 1 Nov 2010 09:45:04 +0000 (18:45 +0900)

Trivial merge