Merge 0.8 -> trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 5 Apr 2011 13:38:08 +0000 (14:38 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 5 Apr 2011 13:38:08 +0000 (14:38 +0100)
commitc53ddcd67f4d4831e19dbeba2800a596273124d6
tree59ee455eed836439659c9f0fe7840831cbee4100
parent4be04da812de6d9d93457ecbbd245190706b8029
parent6060b4a59bc700d6001414d60a59d101a0e5306b
Merge 0.8 -> trunk