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)
commitc715e9a420f6d1d16bd6cd11f8d8e14c9b2fc85d
tree01a6598b191d4f9c09bd04a890b3b9f0e2f959cf
parenta1b6a04fbe27761f918955f928c60c5ea43ab2e8
parent2e444a5714593fb7659157cee2e7037577c0bdcd
Merge tag 'upstream/1.8.5'

Upstream version 1.8.5