Merge commit 'upstream/0.1.15'
authorCharles Plessy <plessy@debian.org>
Tue, 12 Apr 2011 10:40:07 +0000 (19:40 +0900)
committerCharles Plessy <plessy@debian.org>
Tue, 12 Apr 2011 10:40:07 +0000 (19:40 +0900)

Trivial merge