Merge commit 'upstream/0.4b44'
authorBdale Garbee <bdale@gag.com>
Fri, 10 Jun 2011 15:49:29 +0000 (09:49 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 10 Jun 2011 15:49:29 +0000 (09:49 -0600)

Trivial merge