merge of 'b4827e098fbbf66579c962a3d189b3e622b94406'
authorRod Whitby <rod@whitby.id.au>
Thu, 8 Mar 2007 23:11:07 +0000 (23:11 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 8 Mar 2007 23:11:07 +0000 (23:11 +0000)
     and 'df3adfe2ad30b67a7d45f03207aeb8fda510c37b'


Trivial merge