Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Sun, 21 Feb 2010 16:43:05 +0000 (16:43 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 21 Feb 2010 16:43:05 +0000 (16:43 +0000)
commitf17014be481d9a660bb8ceb84d906a07a7699d9b
treee0424fa83e56b3b610d020443000306732d07635
parent66bcb01c3f8fb784349fcaf30cbdcae13804559b
parentbaa1bbd356cc8f0e9d1c6043a8cd51d8fcd09dfb
Merge with 0.7