Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 2 Jun 2011 01:31:18 +0000 (02:31 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 2 Jun 2011 01:31:18 +0000 (02:31 +0100)
commite157cd13e86685e77c8ba0e9f4e97e729af8d821
tree69cf24e5ea5da5426b9de8f8cb63cb2708ffe49a
parent3eb2b3b4b2bb451b4f49c5fb0738837edfb835f3
parent67b9e1cb209dd96e916fcb9c3e7c0afa5f05225e
Merge 0.8->trunk