merge of 63a6f6349530accb6a38bc556a6c380e3bf4d32c
authorRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 10:17:36 +0000 (10:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 10:17:36 +0000 (10:17 +0000)
     and db250e90647c3e4170f1c2c8ebc6116f90005436


Trivial merge