merge of 0cfaa91f1c4baed2bd0f736997c312adea35d3b8
authorRod Whitby <rod@whitby.id.au>
Sat, 30 Dec 2006 22:33:59 +0000 (22:33 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 30 Dec 2006 22:33:59 +0000 (22:33 +0000)
     and a90a976e24dcd66b537a5759c87fd5bcdec913db


Trivial merge