Merge branch 'release-0.6'
authorAndrew Ruthven <andrew@etc.gen.nz>
Sat, 12 Jan 2008 04:04:31 +0000 (17:04 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Sat, 12 Jan 2008 04:04:31 +0000 (17:04 +1300)

Trivial merge