Merge commit 'upstream/0.4.1'
authorCharles Plessy <plessy@debian.org>
Mon, 14 Feb 2011 09:53:02 +0000 (18:53 +0900)
committerCharles Plessy <plessy@debian.org>
Mon, 14 Feb 2011 09:53:02 +0000 (18:53 +0900)

Trivial merge