Merge tag 'upstream/0.01b'
authorChris Butler <chrisb@debian.org>
Mon, 26 Mar 2012 18:15:12 +0000 (19:15 +0100)
committerChris Butler <chrisb@debian.org>
Mon, 26 Mar 2012 18:15:12 +0000 (19:15 +0100)
Upstream version 0.01b


Trivial merge