merge of 02ab7c72fd826e69cd843ab2fa509a26d943e18b
authorRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 18:32:17 +0000 (18:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 18:32:17 +0000 (18:32 +0000)
     and f6984559ee3ceacd26c9a88bcbb390fd0574a04a


Trivial merge