Merge commit 'upstream/1.8.3p1'
authorBdale Garbee <bdale@gag.com>
Wed, 26 Oct 2011 22:58:53 +0000 (00:58 +0200)
committerBdale Garbee <bdale@gag.com>
Wed, 26 Oct 2011 22:58:53 +0000 (00:58 +0200)

Trivial merge