merge of '6cea0e089de18ef78c84f8d8e47107c117a92a40'
authorRod Whitby <rod@whitby.id.au>
Sun, 11 Nov 2007 15:12:28 +0000 (15:12 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 11 Nov 2007 15:12:28 +0000 (15:12 +0000)
     and 'c8012b91de659c67894e88977d46721ae112706f'


Trivial merge