merge of 361379aa261c9847d4ff3ffcf77bb2fa90c4b6bf
authorRod Whitby <rod@whitby.id.au>
Sat, 9 Dec 2006 19:17:15 +0000 (19:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 9 Dec 2006 19:17:15 +0000 (19:17 +0000)
     and e4fada900257177aa872c68e6c6da6fc12099662


Trivial merge