Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 23:47:35 +0000 (00:47 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 23:47:35 +0000 (00:47 +0100)
commitd9eb74be0c5621aeef4609019949aabdc564f63d
tree265221640b00f27669381f5117eec81ade668258
parentaccfc1cd7f0dab59b183074173f6265eba772d13
parentbc3fb0b7f60c7241e44f8dda626ac7656d5d7857
Merge 0.7->trunk