Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Wed, 17 Feb 2010 13:22:42 +0000 (13:22 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 17 Feb 2010 13:22:42 +0000 (13:22 +0000)
commit6518e568cb7853ababe6225af3b4c67485e84650
treec0ebb652585d9e267976c8b47a4e50b03b0d7596
parent068dc233089b1f57581e5cdf6be8146638e33f60
parent8165c70ce1e7bf4216d2b1b5066d52a648ecc0de
Merge with 0.7