Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 5 May 2010 10:25:26 +0000 (11:25 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 5 May 2010 10:25:26 +0000 (11:25 +0100)
commitc3313f10b24e4a714b47824b9d3ef4650e33f02a
tree3cf6088199b22392a519b5744cebe18cd40966e3
parent2946c8f5ab14d38c15aee44041f0e717293a883d
parentb6923f640370d62154963189abcae15223804100
Merge 0.7->trunk