merge of '251b8fa089240d2ed3882d11ffce8801c32e32d9'
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Apr 2007 09:48:41 +0000 (09:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 7 Apr 2007 09:48:41 +0000 (09:48 +0000)
     and '9038c70d2fda45862435fffae732989b6379622e'


Trivial merge