Merge commit 'upstream/1.7.4p5'
authorBdale Garbee <bdale@gag.com>
Sun, 16 Jan 2011 02:31:36 +0000 (19:31 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 16 Jan 2011 02:31:36 +0000 (19:31 -0700)

Trivial merge