Merge commit 'upstream/0.1.14'
authorCharles Plessy <plessy@debian.org>
Tue, 29 Mar 2011 03:52:27 +0000 (12:52 +0900)
committerCharles Plessy <plessy@debian.org>
Tue, 29 Mar 2011 03:52:27 +0000 (12:52 +0900)

Trivial merge