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)
commit509b8ec62adac85558c32ed51cbc11ec4b93d8c7
treea81854e3e76f30c1cf1a1890ac1d0190f1da3fc2
parentd6e047d7d45ea76d56dccb53cc1fe1f5b54734d5
parent5b51a8d6247bd5ad76179e648aaccf8246c78f9d
Merged 8899:9136 and 9145 from trunk.