Merge commit 'upstream/0.4b43'
authorBdale Garbee <bdale@gag.com>
Fri, 11 Jun 2010 15:49:22 +0000 (09:49 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 11 Jun 2010 15:49:22 +0000 (09:49 -0600)

Trivial merge