Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 6 Apr 2011 13:48:00 +0000 (14:48 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 6 Apr 2011 13:48:00 +0000 (14:48 +0100)
commite634f16a2d38152d8ea8c78396f98e9a7fa3a2e1
tree3a7b4f0cea8b5c8004464c99f02a175546c843d3
parentc53ddcd67f4d4831e19dbeba2800a596273124d6
parentab49978eef13fd2f94671cf0673e72cc607a6ebf
Merge 0.8->trunk