Merge commit 'upstream/1.8.3'
authorBdale Garbee <bdale@gag.com>
Sun, 23 Oct 2011 05:41:45 +0000 (23:41 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 23 Oct 2011 05:41:45 +0000 (23:41 -0600)

Trivial merge