Merge commit 'upstream/1.8.2'
authorBdale Garbee <bdale@gag.com>
Wed, 24 Aug 2011 15:39:59 +0000 (09:39 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 24 Aug 2011 15:39:59 +0000 (09:39 -0600)
commit305bd839dd0df08fdacf0a3f20bbe801e698daed
tree43b86a1f27affc1e4508ddbe7de3369ed6134ee9
parent5c375c9204f21786847fa4a2220309cd4001e2fd
parentdb542536bfb942d0168310cac588babc62657621
Merge commit 'upstream/1.8.2'