merge of '0e9339789b8be553a43cbdf4010cc70792764d17'
authorRod Whitby <rod@whitby.id.au>
Sat, 27 Jan 2007 21:39:31 +0000 (21:39 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 27 Jan 2007 21:39:31 +0000 (21:39 +0000)
     and 'd4eb4ca83d3c296c262477a5a3f77d388d7a8ceb'


Trivial merge