merge of '19862cf656ab4627cf2584d440d224095e65adcd'
authorRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 08:14:20 +0000 (08:14 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 08:14:20 +0000 (08:14 +0000)
     and '921c450ea660c1b234a37465d6459c233659b997'


Trivial merge