merge of '24a361b09feb3d013916a5f821f3e40842578ebd'
authorRod Whitby <rod@whitby.id.au>
Fri, 30 Mar 2007 20:10:27 +0000 (20:10 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 30 Mar 2007 20:10:27 +0000 (20:10 +0000)
     and 'ebdffc893fb36ab4655f6e5b18629fee23d9da16'


Trivial merge