Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 8 Jul 2012 17:49:44 +0000 (18:49 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 8 Jul 2012 17:49:44 +0000 (18:49 +0100)
commitc7db4b9b2d7a6876a2302d1b6fd5f1d2fff61e08
treed17029322fafd2a863ee1e047ca71f3929c57e80
parent5f2ead94eb8042edcac4da818274e3865740c421
parentb9490d3be2cdeb1fd0405891e9dc8348b502dd5f
Merge 0.9->trunk