merge of 014ac97e72d6411c86ebf1062d793df0d1f2781e
authorRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 21:31:44 +0000 (21:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 21:31:44 +0000 (21:31 +0000)
     and c2bcaa2c6b57e1972502fc4e2c689e9ba290f0c9


Trivial merge