merge of 'b77bbe31e8594f7d7724c20dd668f62a3ecac8f0'
authorRod Whitby <rod@whitby.id.au>
Sat, 22 Sep 2007 10:16:58 +0000 (10:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 22 Sep 2007 10:16:58 +0000 (10:16 +0000)
     and 'e3fa4ab0e51ec72d171b5d973d3cdbdafe22b60c'


Trivial merge