Merge tag 'upstream/1.8.5p2'
authorBdale Garbee <bdale@gag.com>
Thu, 28 Jun 2012 18:01:08 +0000 (12:01 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 28 Jun 2012 18:01:08 +0000 (12:01 -0600)
Upstream version 1.8.5p2


Trivial merge