Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Thu, 18 Feb 2010 16:46:07 +0000 (16:46 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 18 Feb 2010 16:46:07 +0000 (16:46 +0000)
commit34e1c4255a35f10d7a87659eadd33607956eff36
tree4cd0d2ec4c7c03553ce9ae55132d85802f2bced9
parent1acdf9ae6809b65639bdb961ca697c52787608a4
parent4e19b8b1d2f51be4c1afb7f517f94fe7968b591c
Merge with 0.7