Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 20 Apr 2011 17:20:29 +0000 (18:20 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 20 Apr 2011 17:20:29 +0000 (18:20 +0100)
commit9e5a592c56009652ca4ca6b05a632aa7ae10392c
tree2ae520ecf1f70575b83532f368d96b9e10b2ee99
parenta652eb77baf17f57f31bc08198bab0999e8865cd
parentf62f6f54d6dc62eced781e6452ae5108a0fdbd9b
Merge 0.8->trunk