Merge commit 'upstream/0.1.13'
authorCharles Plessy <plessy@debian.org>
Wed, 2 Mar 2011 04:30:55 +0000 (13:30 +0900)
committerCharles Plessy <plessy@debian.org>
Wed, 2 Mar 2011 04:30:55 +0000 (13:30 +0900)

Trivial merge