Merge tag 'upstream/1.8.6p8'
authorBdale Garbee <bdale@gag.com>
Sat, 13 Apr 2013 04:43:20 +0000 (22:43 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 13 Apr 2013 04:43:20 +0000 (22:43 -0600)
Upstream version 1.8.6p8


Trivial merge