Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 3 Apr 2010 22:09:59 +0000 (23:09 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 3 Apr 2010 22:09:59 +0000 (23:09 +0100)
commite9eaf74ccb69fc69cd577d320d7f46cf525535af
tree266e3395805b6fcea3d7a01dcda27037d2f09fb9
parent425f13a269dfb7f7458baaea17fd254caea45b45
parentf0e43aadc56cbc16996dcae1298999d68e808c89
Merge 0.7->trunk