Merge commit 'upstream/1.8.2'
authorBdale Garbee <bdale@gag.com>
Wed, 24 Aug 2011 15:39:59 +0000 (09:39 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 24 Aug 2011 15:39:59 +0000 (09:39 -0600)

Trivial merge