Merge tag 'upstream/0.2.1'
authorBdale Garbee <bdale@gag.com>
Thu, 11 Oct 2012 15:02:15 +0000 (09:02 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 11 Oct 2012 15:02:15 +0000 (09:02 -0600)
Upstream version 0.2.1


Trivial merge