Merge commit 'upstream/1.8.3p2'
authorBdale Garbee <bdale@gag.com>
Mon, 30 Jan 2012 23:08:02 +0000 (16:08 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 30 Jan 2012 23:08:02 +0000 (16:08 -0700)

Trivial merge