merge of 'd837a559b31200c4edf7278c659eed0fb1c84f32'
authorRod Whitby <rod@whitby.id.au>
Sun, 13 May 2007 23:04:07 +0000 (23:04 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 13 May 2007 23:04:07 +0000 (23:04 +0000)
     and 'f77907054cfb58790473853a2015a063657bb74f'


Trivial merge