Merge 7296:7427 from export branch to trunk.
authorTom Hughes <tom@compton.nu>
Sat, 19 Apr 2008 13:14:30 +0000 (13:14 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 19 Apr 2008 13:14:30 +0000 (13:14 +0000)

Trivial merge