merge of 89b615f68e4d28221c572c377d078083b36765ba
authorRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 20:17:42 +0000 (20:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 20:17:42 +0000 (20:17 +0000)
     and d3a4f1285a8d621925836a8a2ea609ea62d1cc9d


Trivial merge