Merge commit '1640e9f0f39bf8108370c2f5d99bb100fe6c9418' into blead
authorChip Salzenberg <chip@pobox.com>
Thu, 9 Jul 2009 07:44:18 +0000 (00:44 -0700)
committerChip Salzenberg <chip@pobox.com>
Thu, 9 Jul 2009 07:44:18 +0000 (00:44 -0700)

Trivial merge