merge of '1e54b4f2db4e8ef4f33743de51d73d55e8b83a96'
authorRod Whitby <rod@whitby.id.au>
Wed, 28 Nov 2007 13:47:18 +0000 (13:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 28 Nov 2007 13:47:18 +0000 (13:47 +0000)
     and '33e5bd40976428aea7682da1e3cb6ed9c93af23e'


Trivial merge