Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:58:00 +0000 (11:58 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:58:00 +0000 (11:58 +0100)
commitaccfc1cd7f0dab59b183074173f6265eba772d13
tree3c7bd79f421d02889a064274601202a6b090d0a2
parent28bec28b434031d2649f84295157006b31b17a4c
parent24bf3562cda0d32670ce1e848a74bef67cde0c0f
Merge 0.7->trunk