Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 24 May 2010 15:52:12 +0000 (16:52 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 24 May 2010 15:52:12 +0000 (16:52 +0100)
commitf80a6d6c7d70ffc3c71b577247f93d47b8c65a8b
tree3ba6d294204def13ec5e9bd1c0efba118e547dca
parent6931622fc766d8100bd31d23bd0e346a56b82055
parent6c541b487decc2c9829fa48cfecff3990f1eee73
Merge 0.7->trunk