Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 4 May 2011 22:13:50 +0000 (23:13 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 4 May 2011 22:13:50 +0000 (23:13 +0100)
commitfc17898f4520caf4ab3f5374b6c3e27a84712e11
tree93789b4c9c75989a753c0107b5aebd4154311b07
parent7b10f3c901b217eea1268e185bc34df5a80c5d2b
parent9e5a592c56009652ca4ca6b05a632aa7ae10392c
Merge 0.8->trunk