Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 2 Jun 2011 23:58:09 +0000 (00:58 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 2 Jun 2011 23:58:09 +0000 (00:58 +0100)
commit48a936764b03a83a0a7b99425439de52bfb1afea
treeac407507d2c55a667885ee35d713d233119138cf
parent7901fd65aaec8596d5a79eccea0df801b860e5b7
parent3ab9f904ccd31dfde2ade024a2e5e0fa543f25da
Merge 0.8->trunk