Merge tag 'upstream/0.2.6'
authorCharles Plessy <plessy@debian.org>
Fri, 22 Jun 2012 03:42:40 +0000 (12:42 +0900)
committerCharles Plessy <plessy@debian.org>
Fri, 22 Jun 2012 03:42:40 +0000 (12:42 +0900)
Upstream version 0.2.6


Trivial merge