Merge commit 'upstream/1.7.2p6'
authorBdale Garbee <bdale@gag.com>
Mon, 19 Apr 2010 16:43:29 +0000 (10:43 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 19 Apr 2010 16:43:29 +0000 (10:43 -0600)

Trivial merge