merge of 0e7cf314445d29e0276495334a084542f8d43c44
authorRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 12:33:29 +0000 (12:33 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 12:33:29 +0000 (12:33 +0000)
     and e715d97043723bd6f5de46239548acce2298191a


Trivial merge