merge of '4b1104995a63f0dbc8e77f81187ca99b59678c01'
authorRod Whitby <rod@whitby.id.au>
Sat, 28 Apr 2007 02:43:01 +0000 (02:43 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 28 Apr 2007 02:43:01 +0000 (02:43 +0000)
     and 'e1f39a9d05343b3bb1b72d9e08bfe0c7fd20b15b'


Trivial merge