Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 7 Jul 2012 01:43:57 +0000 (02:43 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 7 Jul 2012 01:43:57 +0000 (02:43 +0100)
commitb9490d3be2cdeb1fd0405891e9dc8348b502dd5f
tree872698bac7a0ea8290d3508f3bee9be72455231d
parent874649c28e6c4b6316cbeb6cec559d4e9666afc7
parent6cd8cfafaab03a47d3c511bcc95c758e7c1d4428
Merge 0.9->trunk