Merge commit 'upstream/1.7.4p6'
authorBdale Garbee <bdale@gag.com>
Wed, 9 Feb 2011 18:24:01 +0000 (11:24 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 9 Feb 2011 18:24:01 +0000 (11:24 -0700)

Trivial merge