Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Thu, 18 Feb 2010 19:00:50 +0000 (19:00 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 18 Feb 2010 19:00:50 +0000 (19:00 +0000)
commit364537b7a87ceaaec49fcc470325a16f9500dc85
treeab91034f2c769418039e704ee8069ad7245da4a2
parente3ef16499f5955da1633228550500dd5ba3383ea
parenta2db45e2fefdac9b65cde4ee1b7ab31834d6fff9
Merge with 0.7