Merge commit 'upstream/0.1.11'
authorCharles Plessy <plessy@debian.org>
Fri, 3 Dec 2010 04:24:35 +0000 (13:24 +0900)
committerCharles Plessy <plessy@debian.org>
Fri, 3 Dec 2010 04:24:35 +0000 (13:24 +0900)

Trivial merge