Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 24 May 2010 18:46:12 +0000 (19:46 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 24 May 2010 18:46:12 +0000 (19:46 +0100)
commitb9ac16f2788ac8daaeff08da599024a68ebf94e2
treec7a6f242f1445f958c2ab4da26fb7bab12f430fc
parentcee7f315f78567be0709ac29e4c0acd93bbcd347
parent89c6fc55e2cc713042ef389a37ac64182e8f7266
Merge 0.7->trunk