Merge commit 'upstream/0.2.5'
authorCharles Plessy <plessy@debian.org>
Sat, 7 May 2011 12:17:57 +0000 (21:17 +0900)
committerCharles Plessy <plessy@debian.org>
Sat, 7 May 2011 12:17:57 +0000 (21:17 +0900)

Trivial merge