merge of '74c545ed021de12395e8e037da79100e4b8f5a18'
authorRod Whitby <rod@whitby.id.au>
Mon, 24 Dec 2007 01:10:16 +0000 (01:10 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 24 Dec 2007 01:10:16 +0000 (01:10 +0000)
     and 'a70eb4537d92437b2af4fb50a7250a04e5814ee4'


Trivial merge