merge of '426022a70eefa9cef4f266532c2febde719d5cd9'
authorRod Whitby <rod@whitby.id.au>
Wed, 11 Apr 2007 13:13:26 +0000 (13:13 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 11 Apr 2007 13:13:26 +0000 (13:13 +0000)
     and 'f68bdf694384234d06c82a86ab6a067bc03df866'


Trivial merge