merge of '08136d5064fb99224b41d7d2c341f887c04a9f13'
authorRod Whitby <rod@whitby.id.au>
Fri, 17 Nov 2006 04:43:45 +0000 (04:43 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 17 Nov 2006 04:43:45 +0000 (04:43 +0000)
     and 'a3369ab4720700b0631cc1b56b85ae78f98ef76f'


Trivial merge