merge of '02896db153506db9332a007c3b54a440e15c95bd'
authorRod Whitby <rod@whitby.id.au>
Fri, 27 Apr 2007 11:45:28 +0000 (11:45 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 27 Apr 2007 11:45:28 +0000 (11:45 +0000)
     and 'bd7c8e1bf8c542b214b7d6e21e849e512bb796e1'


Trivial merge