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)
commitc8bf26711c935aa14af1cfd72d8badc39b130f85
tree1617f679bdb27140f4ba3d1405a3603d5228a14e
parentf4fa8ed40e608105bac8fa06da3695c688327b51
parentd4010ff589d6e9b8da11efe7bb5e176e401b939b
Merge 7296:7427 from export branch to trunk.