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)
commit0cb97bd7d96030c07d9716c3d26d39bcd4f712ff
tree1eae59c478359f1fb262a5f34e369039c5230385
parentd69a518b9e69107503b332728dfa583594293ea1
parentcfc14f1ddc0b451dbfdd5994e5672b2f1b11e0a8
Merge 8381:8390 from trunk.