Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Thu, 18 Feb 2010 18:57:55 +0000 (18:57 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 18 Feb 2010 18:57:55 +0000 (18:57 +0000)
commite3ef16499f5955da1633228550500dd5ba3383ea
treeab91034f2c769418039e704ee8069ad7245da4a2
parentb82b04436da481579473472be8a694dd126ee830
parent34e1c4255a35f10d7a87659eadd33607956eff36
Merge with 0.7