merge of 883aa5812e7df804d1bb7c488427d4534a7a84f5
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 19:48:50 +0000 (19:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 19:48:50 +0000 (19:48 +0000)
     and b42e50214bebba155e60a6ae69b734434b915d35


Trivial merge