Merge commit 'upstream/0.1.17'
authorCharles Plessy <plessy@debian.org>
Mon, 11 Jul 2011 11:18:59 +0000 (20:18 +0900)
committerCharles Plessy <plessy@debian.org>
Mon, 11 Jul 2011 11:18:59 +0000 (20:18 +0900)
commite2bd290b8643f0a728c282a8b825392307750210
treec932ba57da52c2f894595864dbaeb9b15f37c470
parent9f4bebab2e0917c676ae739b2d05cb22ad6c4ed5
parentb301e959d73eee0955c57004f344f17af00703f4
Merge commit 'upstream/0.1.17'