merge of '3267272c84aca4cba0b1f3d43c934a2d3be05af4'
authorRod Whitby <rod@whitby.id.au>
Fri, 27 Apr 2007 09:12:27 +0000 (09:12 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 27 Apr 2007 09:12:27 +0000 (09:12 +0000)
     and 'a815bc82da1cf39c563d663e1cef1ad3ddb15505'


Trivial merge