merge of '5503536a71ee0d60ce94d9262c78c993b11f21b0'
authorRod Whitby <rod@whitby.id.au>
Fri, 9 Feb 2007 05:04:36 +0000 (05:04 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 9 Feb 2007 05:04:36 +0000 (05:04 +0000)
     and 'cc34d79aab0d07bb518316c63a085fbb79569115'


Trivial merge