merge of '5d9a3dbda7c7be2f89b97ce73d4362d2ca2a846e'
authorRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 08:24:44 +0000 (08:24 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 3 Apr 2007 08:24:44 +0000 (08:24 +0000)
     and 'c3a4380d6020add9c6a5ed01f5c9ae268d1aa541'


Trivial merge