Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 18 May 2010 22:29:44 +0000 (23:29 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 18 May 2010 22:29:44 +0000 (23:29 +0100)
commitee12c21dba990435ff97889443a97ce450bb773a
treecd5248386c77d045a91e6590f83e18018d2516ac
parentd9eb74be0c5621aeef4609019949aabdc564f63d
parent8883b271b86c9d652aaa30c8dedba02bc190de08
Merge 0.7->trunk