Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Mon, 22 Feb 2010 01:04:27 +0000 (01:04 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 22 Feb 2010 01:04:27 +0000 (01:04 +0000)
commite644762969c79b7d5e4ac09018ae3000f7843068
treed9dbb8de639329d8fafc71838bf902539f8a5c44
parent7845270a8097ae00763a94525660490956d046bc
parent32a682823441809d5d963b9245114b4c0fc8cd37
Merge with 0.7