Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 5 Jul 2012 16:40:12 +0000 (17:40 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 5 Jul 2012 16:40:12 +0000 (17:40 +0100)
commite8923475ab276515e5d4fff920be6cb4eacdbe5a
tree159b42080b182de94d41a68c7d2648ae483d6b47
parent5f9073e7d20f7c1825ee8068fefb7bc2035c2ebd
parentb22a1e69d050c21f2581aedc643b309574599807
Merge 0.9->trunk