merge of 03ee5c18fcd59d8dab308dd8b281cf7dfd3a96b7
authorRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 10:17:31 +0000 (10:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 10:17:31 +0000 (10:17 +0000)
     and 6f4e57d60a95fb5db9330f41b66258937b0126e9


Trivial merge