merge of 'e6967a90020b84553487e008644039b8e0fad143'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 7 May 2007 19:25:30 +0000 (19:25 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 7 May 2007 19:25:30 +0000 (19:25 +0000)
     and 'f98e1fc33b6d30e6e946f29f43f26ffaa1b5fcad'


Trivial merge