merge of 75df08ef6f859dde5bd1e1929e94ba188247d5a3
authorRod Whitby <rod@whitby.id.au>
Sun, 31 Dec 2006 21:47:16 +0000 (21:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 31 Dec 2006 21:47:16 +0000 (21:47 +0000)
     and abb83ffc2c99e23157f03c5799d2e3c6d1629808


Trivial merge