merge of '3c8de2560478b42631b53f526f6839d2a4403cc9'
authorRod Whitby <rod@whitby.id.au>
Wed, 27 Dec 2006 22:53:25 +0000 (22:53 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 27 Dec 2006 22:53:25 +0000 (22:53 +0000)
     and '7255f9463a418dff8966b4189b5210a7ea8df038'


Trivial merge