Merge 16817:16819 from trunk.
authorTom Hughes <tom@compton.nu>
Mon, 3 Aug 2009 23:59:17 +0000 (23:59 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 3 Aug 2009 23:59:17 +0000 (23:59 +0000)

Trivial merge