Merge commit 'upstream/0.1.7a.dfsg'
authorCharles Plessy <charles@anx178.gsc.riken.jp>
Tue, 17 Nov 2009 01:33:36 +0000 (10:33 +0900)
committerCharles Plessy <charles@anx178.gsc.riken.jp>
Tue, 17 Nov 2009 01:33:36 +0000 (10:33 +0900)

Trivial merge