merge of 06a1855a43c924a4f7630ca044ddffc956844d7c
authorRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 19:48:32 +0000 (19:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 19:48:32 +0000 (19:48 +0000)
     and fe7f09c0ab220b629fe9a568245cfe155bbeb443


Trivial merge