Merge commit 'upstream/0.5'
authorCharles Plessy <plessy@debian.org>
Wed, 8 Jun 2011 10:40:42 +0000 (19:40 +0900)
committerCharles Plessy <plessy@debian.org>
Wed, 8 Jun 2011 10:40:42 +0000 (19:40 +0900)

Trivial merge