Merge commit 'upstream/0.2.3'
authorCharles Plessy <plessy@debian.org>
Thu, 9 Dec 2010 09:56:36 +0000 (18:56 +0900)
committerCharles Plessy <plessy@debian.org>
Thu, 9 Dec 2010 09:56:36 +0000 (18:56 +0900)

Trivial merge