Merge commit 'upstream/1.7.2p5'
authorBdale Garbee <bdale@gag.com>
Thu, 11 Mar 2010 18:49:52 +0000 (11:49 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 11 Mar 2010 18:49:52 +0000 (11:49 -0700)

Trivial merge