merge of '53028d18d16b3a9d612f8bfb2622942c63c8d639'
authorRod Whitby <rod@whitby.id.au>
Mon, 26 Mar 2007 21:45:20 +0000 (21:45 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 26 Mar 2007 21:45:20 +0000 (21:45 +0000)
     and 'd4ed6162e51ea7347d16180b7ff77713246a7b99'


Trivial merge