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)

Trivial merge