Merge commit 'upstream/1.7.6p1'
authorBdale Garbee <bdale@gag.com>
Tue, 26 Apr 2011 19:58:20 +0000 (13:58 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 26 Apr 2011 19:58:20 +0000 (13:58 -0600)
commit5c8f8bf137761b6776ee46ad1c509ba55eb07401
treee19f8963440d5528e53083838315a0d63052e81b
parenta270b8504cc008103fc786c58be024eea7c1eabe
parentf3530d8198251b72d01da9a07b1fa518446ec0f0
Merge commit 'upstream/1.7.6p1'