merge of 21188e8c51279bd1abd8427a3340581138eaeca3
authorRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 12:17:09 +0000 (12:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 12:17:09 +0000 (12:17 +0000)
     and d4b34a17ff4133d0be64c86a6f6ac6a1541f7fd5


Trivial merge