merge of '66b41b8997b569b1c7bab96deb57ca0bcf5282fe'
authorRod Whitby <rod@whitby.id.au>
Sat, 6 Jan 2007 12:21:57 +0000 (12:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 6 Jan 2007 12:21:57 +0000 (12:21 +0000)
     and '6b8185c89368b273f776e5735aeff0d2933002ae'


Trivial merge