Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 11 Apr 2011 16:01:55 +0000 (17:01 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 11 Apr 2011 16:01:55 +0000 (17:01 +0100)
commit9975b0fb2a41853759f62c9864b0bf2f0847d3d3
tree2bc801cb99f9dbb9de592a6032c808d632b0da86
parent3c397c79fbd40cea52add7a58d481296602a4755
parentf7f0c23d27cd61b7410a7b14df845adb0ac201b2
Merge 0.8->trunk