Merge with release-9.0 branch.
authorChris Hanson <org/chris-hanson/cph>
Wed, 10 Mar 2010 05:16:06 +0000 (21:16 -0800)
committerChris Hanson <org/chris-hanson/cph>
Wed, 10 Mar 2010 05:16:06 +0000 (21:16 -0800)

Trivial merge