Merge commit 'upstream/1.7.4p4'
authorBdale Garbee <bdale@gag.com>
Tue, 7 Sep 2010 15:03:49 +0000 (09:03 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 7 Sep 2010 15:03:49 +0000 (09:03 -0600)

Trivial merge