merge of 6bcacc9371f97cfdd5bcf5507e1afc90ece8b3ad
authorRod Whitby <rod@whitby.id.au>
Sat, 23 Dec 2006 23:06:02 +0000 (23:06 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 23 Dec 2006 23:06:02 +0000 (23:06 +0000)
     and 851a65b990ed186ba46dfa7fe340b495404ef429


Trivial merge