merge of '2ff0b12bedc3fd85cd0cbbce60e7586f5ae352b5'
authorRod Whitby <rod@whitby.id.au>
Fri, 1 Dec 2006 10:30:08 +0000 (10:30 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 1 Dec 2006 10:30:08 +0000 (10:30 +0000)
     and 'a1833fa642a839f32dc4d8e47347b73849b62b48'


Trivial merge