Merge commit 'upstream/1.7.2p7'
authorBdale Garbee <bdale@gag.com>
Thu, 10 Jun 2010 21:40:16 +0000 (15:40 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 10 Jun 2010 21:40:16 +0000 (15:40 -0600)

Trivial merge