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)
commit064d9c4a8af8a082f05bd2f38b729346103ffd4e
tree8fe9228ba256647a2c3a06bd391ee09eeaa356e3
parentd90c1b5ac5adcc9a49de8af978555d6b0ffdeb29
parent10e2bb45002784b73d4fb0f6c8b52427ec503577
Merge commit 'upstream/0.4.1'