merge of '350577dc9d50fd104cbe65fcdd6fc4ef3687461a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 12 Feb 2007 11:55:35 +0000 (11:55 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 12 Feb 2007 11:55:35 +0000 (11:55 +0000)
     and 'f4212e83ebe4da66cf3e61254a93596210c1577d'


Trivial merge