Merge commit 'upstream/0.1.18'
authorCharles Plessy <plessy@debian.org>
Tue, 6 Sep 2011 06:48:40 +0000 (15:48 +0900)
committerCharles Plessy <plessy@debian.org>
Tue, 6 Sep 2011 06:48:40 +0000 (15:48 +0900)
commitb990d9d3dd518a9cf7b7f4a165c584d8d8d1cfb0
treee106d3b39e5a0737e169dbc9d638523e91bc6747
parent5075acdfc387c56ca8411cde3e419e867da9804d
parent0f906dafb2ad22371a753557562ef95c3034480d
Merge commit 'upstream/0.1.18'