Merge commit 'upstream/0.2.4'
authorCharles Plessy <plessy@debian.org>
Tue, 12 Apr 2011 05:57:33 +0000 (14:57 +0900)
committerCharles Plessy <plessy@debian.org>
Tue, 12 Apr 2011 05:57:33 +0000 (14:57 +0900)
commit6154f20a217dfc124ef3016ba6adccd709c00f29
treec63c0b03d02583be46fc46d6a6b9fcedf623a6f6
parenta13445ebea285c5644070abb89c6be40dec17a47
parent2112b1dba17e822d8028151605b4cdc01f0a4c3d
Merge commit 'upstream/0.2.4'