Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Tue, 19 May 2009 12:07:13 +0000 (13:07 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 19 May 2009 12:07:13 +0000 (13:07 +0100)
commite7c04fdd46bc9bb27abb73392bfba42326123968
treed34a839895ec8b22821abdcb39a209b4ebb3a786
parent68d82f0c5928c791324dfe23a9e186ae8e78dda7
parent54405733af713752776d55603c77ce68f5d66341
Merge with 0.4