merge of '6396af305b4f951d7d88215419603669286e4715'
authorRod Whitby <rod@whitby.id.au>
Fri, 30 Mar 2007 16:50:13 +0000 (16:50 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 30 Mar 2007 16:50:13 +0000 (16:50 +0000)
     and 'ec901188db91713e17379558a1160d8fa110f22c'


Trivial merge