Merge commit 'upstream/0.1.16'
authorCharles Plessy <plessy@debian.org>
Sat, 7 May 2011 08:30:17 +0000 (17:30 +0900)
committerCharles Plessy <plessy@debian.org>
Sat, 7 May 2011 08:30:17 +0000 (17:30 +0900)
commitb7c06ea4740153b8f27c7c2374131dbd607b6113
tree1b80c5cb313d83b205612bd9f9780247f0f96dbe
parentcdbe062086fb28ae4cc8dd0bfb224592bfb40d7d
parent8a8212c76299ff302cdd41be704d8e0308bd2b1b
Merge commit 'upstream/0.1.16'