Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Tue, 16 Feb 2010 17:16:12 +0000 (17:16 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 16 Feb 2010 17:16:12 +0000 (17:16 +0000)
commit8165c70ce1e7bf4216d2b1b5066d52a648ecc0de
tree03c90bc6b47299ccc0e03dbcd5715ba267fdb254
parent274b32c226da69653a8e9b1549e871b94592faba
parentb581697e0677c47b361ce23c8997568cc7a28fac
Merge with 0.7