merge of 'b592c1063a1045b5c449b903ece438c03d0c789d'
authorRod Whitby <rod@whitby.id.au>
Tue, 13 Mar 2007 16:01:05 +0000 (16:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 13 Mar 2007 16:01:05 +0000 (16:01 +0000)
     and 'be764317c941533a6560579325382cea86110ca9'


Trivial merge