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)
commit64659945d8385e32986f184535bb64b76d780e37
tree91b2c4249567af87df4adde5013891dabde89b27
parentb5f2ade53d913ed42f8e22163e77ae78fb991c7a
parentef258354719127382087c58e5c0f83ee45c958f6
Merge tag 'upstream/1.8.5p2'

Upstream version 1.8.5p2