merge of '56dd632a3a9de2d8f4b9d335e96a43648c9cd3bd'
authorRod Whitby <rod@whitby.id.au>
Sun, 20 May 2007 09:01:06 +0000 (09:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 20 May 2007 09:01:06 +0000 (09:01 +0000)
     and '866337340e294f0d9e894aedc0116eb1d80f677f'


Trivial merge