merge of 5c901b0cb81fef82d2c0bd783dd94551f4d1d244
authorRod Whitby <rod@whitby.id.au>
Wed, 27 Dec 2006 21:45:43 +0000 (21:45 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 27 Dec 2006 21:45:43 +0000 (21:45 +0000)
     and 97e37e0de018f0f2400e67f30a5073cb921b1d18


Trivial merge