Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 15 Apr 2011 21:46:57 +0000 (22:46 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 15 Apr 2011 21:46:57 +0000 (22:46 +0100)
commitee8527f2704e1422a2e7b0843bd85db120fb18d6
tree3e38f864eecc748e87f2fbead4a6461f39337961
parent4e8ce7c3dea252cda77d3e7de92459aa1b330d05
parent901108e66f1099428a9d34d83f19130029e1220d
Merge 0.8->trunk