Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 21 May 2010 18:28:56 +0000 (19:28 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 21 May 2010 18:28:56 +0000 (19:28 +0100)
commit4212cd8c86749608b8cab7fa1f167c813f2000c8
treeaa79224d25f83a3a7b7b3a8c2cc79eedc501ebb7
parentfa08a1d97194341c26d308147f8a8682ef6f4291
parent9a027209a704f190084e982c3ea539525220cb35
Merge 0.7->trunk