merge of '55dae195045d9fd52e41e970627ac6ef031ff672'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 13 May 2007 09:09:34 +0000 (09:09 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 13 May 2007 09:09:34 +0000 (09:09 +0000)
     and '692eb13695fa8e30ad7f7f806b5de827575e917a'


Trivial merge