merge of '8827e908a98c3d0805a10db96eda80f5d5e29cd8'
authorRod Whitby <rod@whitby.id.au>
Fri, 1 Dec 2006 11:40:34 +0000 (11:40 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 1 Dec 2006 11:40:34 +0000 (11:40 +0000)
     and 'fb24b0f3b51e2ab57fb4f0291af7e4c6e178b0da'


Trivial merge