merge of 'cfa8d2cb144f036d07edfe4d470a48c730645c51'
authorRod Whitby <rod@whitby.id.au>
Mon, 7 May 2007 00:32:47 +0000 (00:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 7 May 2007 00:32:47 +0000 (00:32 +0000)
     and 'd9305e9051bbce7371ad1d5da3fb95bb80bd399c'


Trivial merge