merge of '091a43208eb362df157d072464e2243612c9bc8b'
authorRod Whitby <rod@whitby.id.au>
Sat, 27 Jan 2007 09:05:57 +0000 (09:05 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 27 Jan 2007 09:05:57 +0000 (09:05 +0000)
     and '126b0b55f1b5f9ef1417ce18ab405a18cb9fa962'


Trivial merge