Merged 8899:9136 and 9145 from trunk.
authorTom Hughes <tom@compton.nu>
Fri, 18 Jul 2008 11:18:39 +0000 (11:18 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 18 Jul 2008 11:18:39 +0000 (11:18 +0000)

Trivial merge