merge of '76f8829bf251437359713bbc14c5fc611c381a32'
authorRod Whitby <rod@whitby.id.au>
Sun, 8 Apr 2007 09:46:15 +0000 (09:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 8 Apr 2007 09:46:15 +0000 (09:46 +0000)
     and 'f3f7bae5d2c6ed92a3c654cac5ab93877664a736'


Trivial merge