Merge commit 'upstream/0.2.4'
authorCharles Plessy <plessy@debian.org>
Tue, 12 Apr 2011 05:57:33 +0000 (14:57 +0900)
committerCharles Plessy <plessy@debian.org>
Tue, 12 Apr 2011 05:57:33 +0000 (14:57 +0900)

Trivial merge