Merge commit 'upstream/1.8.1p2'
authorBdale Garbee <bdale@gag.com>
Fri, 22 Jul 2011 12:53:42 +0000 (14:53 +0200)
committerBdale Garbee <bdale@gag.com>
Fri, 22 Jul 2011 12:53:42 +0000 (14:53 +0200)

Trivial merge