Merge commit 'upstream/1.7.4'
authorBdale Garbee <bdale@gag.com>
Tue, 3 Aug 2010 03:25:41 +0000 (23:25 -0400)
committerBdale Garbee <bdale@gag.com>
Tue, 3 Aug 2010 03:25:41 +0000 (23:25 -0400)
commite8c052b72a5847683684a87315540fdf1f525d9c
treebe9be0dc67c85ea218ae1e2d3a4108ce43ac178d
parenta6aa7f24d10d68ee2ca443679ca02ef97d899404
parentd7751e8b58b26f298b57d31ae87386e685eb8c14
Merge commit 'upstream/1.7.4'