merge of c69a04fa4369e6963714045da040dac56fc4b2da
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 20:17:55 +0000 (20:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 20:17:55 +0000 (20:17 +0000)
     and f8bb378547e28134ff644fa1287e35dc493f12de


Trivial merge