Merge commit 'upstream/0.1.7.dfsg'
authorCharles Plessy <charles@anx178.gsc.riken.jp>
Mon, 16 Nov 2009 05:23:42 +0000 (14:23 +0900)
committerCharles Plessy <charles@anx178.gsc.riken.jp>
Mon, 16 Nov 2009 05:23:42 +0000 (14:23 +0900)

Trivial merge