merge of 'bb1e5c664095ed80fd4291b2edb5f4136cc3b55a'
authorRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 10:36:58 +0000 (10:36 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 10:36:58 +0000 (10:36 +0000)
     and 'c03f5a74a6abc51297a66814aac66d5867322b6c'


Trivial merge