merge of '344d73d144b1bef8196ec90abf704f5fb1054c19'
authorRod Whitby <rod@whitby.id.au>
Fri, 6 Apr 2007 12:09:16 +0000 (12:09 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 6 Apr 2007 12:09:16 +0000 (12:09 +0000)
     and '636bac75e27918f87914b16fd745dd92dd014ea4'


Trivial merge