Merge 8381:8390 from trunk.
authorTom Hughes <tom@compton.nu>
Sun, 22 Jun 2008 15:24:12 +0000 (15:24 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 22 Jun 2008 15:24:12 +0000 (15:24 +0000)

Trivial merge