Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 11 Apr 2010 00:30:31 +0000 (01:30 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 11 Apr 2010 00:30:31 +0000 (01:30 +0100)
commita125c22d5471487be47dc9072fe52138e3b618e6
treeb64a5805486d7ab1519be14d057bd6ba30cb47ff
parent1ce7e3012932cdabf0b8b402ba7d79a2aeb37578
parent2a8e217bf74cc614a6db661d9773c207e8656bbf
Merge 0.7->trunk