Merge commit 'upstream/0.5'
authorCharles Plessy <plessy@debian.org>
Wed, 8 Jun 2011 10:40:42 +0000 (19:40 +0900)
committerCharles Plessy <plessy@debian.org>
Wed, 8 Jun 2011 10:40:42 +0000 (19:40 +0900)
commitef9acd42f1bde03031bf004cb052a06161460642
tree61171d0496c323848eb93ed7752d93188b198d2b
parent4a12af632a520dfdfbf03cb66bbe85cfe7a74ccb
parent46e6c2f107a54e39877ae65e46b3491fbfb85122
Merge commit 'upstream/0.5'