merge of '5f37c53ea4503f290f6cbd39794bc793ac09cf24'
authorRod Whitby <rod@whitby.id.au>
Fri, 30 Mar 2007 15:53:09 +0000 (15:53 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 30 Mar 2007 15:53:09 +0000 (15:53 +0000)
     and '7d26561ebc20e83e44e0b4e7f6200a8e21716189'


Trivial merge