merge of '9a039e377450d290fde23e8f83821bd022343fd4'
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Jun 2007 08:08:44 +0000 (08:08 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Jun 2007 08:08:44 +0000 (08:08 +0000)
     and 'f325de22a31b0cf688674dfc96bed863bdeb049d'


Trivial merge