Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Wed, 17 Mar 2010 14:36:23 +0000 (14:36 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 17 Mar 2010 14:36:23 +0000 (14:36 +0000)
commit19c9e0c0cbdb1b0aeb8a2ffb90cb840076947e2a
tree03bcfcc19cfdb519f7e261e3f6f1ab6bb6858ab6
parent3c8dbc7ad1e998769403421e82369484b6bf1e77
parent74b363acaa97e924a1a10520238caca3ed872964
Merge with 0.7