Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 30 Mar 2010 18:48:04 +0000 (19:48 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 30 Mar 2010 18:48:04 +0000 (19:48 +0100)
commitf0e43aadc56cbc16996dcae1298999d68e808c89
tree05a514961ba273cda5c75bca8aa60fc278c6befc
parent392b51f575c1771ab9a9f88e4b1b487fb8c43660
parent766b0d7351ea05f14247a6707abdc73e57882a3b
Merge 0.7->trunk