merge of 'a42973bf7cd903eb0cda39c0e0c9ca3041188bf1'
authorRod Whitby <rod@whitby.id.au>
Sun, 6 May 2007 23:44:06 +0000 (23:44 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 6 May 2007 23:44:06 +0000 (23:44 +0000)
     and 'dead8726201c5039d0257a605f354059105e7c99'


Trivial merge