Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 3 Jun 2011 04:35:22 +0000 (05:35 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 3 Jun 2011 04:35:22 +0000 (05:35 +0100)
commitc39914d99e1d36cc63095c85467d003cb2d70566
treeae65c6e420a66fdea9b447b165a21581571a7287
parent48a936764b03a83a0a7b99425439de52bfb1afea
parent611b86df40d24787394d26a80c4e140a9cd394c6
Merge 0.8->trunk