merge of 'e860ab75a9e89dc51e19d030c03457e3d1b0c1ad'
authorRod Whitby <rod@whitby.id.au>
Sat, 10 Mar 2007 21:56:44 +0000 (21:56 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 10 Mar 2007 21:56:44 +0000 (21:56 +0000)
     and 'f9f78fead59ee0f7f134452c6f9b8d3e18a26761'


Trivial merge