merge of b596d0edd180623a7984d71329ef90b1fa69c162
authorRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 07:31:13 +0000 (07:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 07:31:13 +0000 (07:31 +0000)
     and ef4b6ce0c6a8b2158b800e027b43892c7b21f53b


Trivial merge