Merge commit 'upstream/0.4b43'
authorBdale Garbee <bdale@gag.com>
Fri, 11 Jun 2010 15:49:22 +0000 (09:49 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 11 Jun 2010 15:49:22 +0000 (09:49 -0600)
commit342c02f24a87e321fb6b774fcb705a85577547d2
tree76266841c255d43e7c7d1af185f9f8ae33339789
parentd1107bcd8ac1078d565dff58c7fff2f4d6049fc9
parent9a0f7d31d8848683face512dcabfc03949c78fb2
Merge commit 'upstream/0.4b43'