Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 9 Apr 2010 11:32:25 +0000 (12:32 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 9 Apr 2010 11:32:25 +0000 (12:32 +0100)
commitd0a173fdc3e1d73fde38fb10c08c1d70c35f27cb
treee6e839537a1fe22c67df5e2ce7a7c29652be2a85
parent2af29f76660589a0c33d879fbff6faa6c5979da8
parent97cae619dee5d532cbaf7d86f0dc694815bccdd9
Merge 0.7->trunk