Merge tag 'upstream/1.8.5'
authorBdale Garbee <bdale@gag.com>
Wed, 16 May 2012 15:20:45 +0000 (09:20 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 16 May 2012 15:20:45 +0000 (09:20 -0600)
Upstream version 1.8.5


Trivial merge