merge of '1f1ee65b78eaa5dbe2156b3cbce011afd24101f0'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 15 Feb 2007 09:19:52 +0000 (09:19 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 15 Feb 2007 09:19:52 +0000 (09:19 +0000)
     and 'a2b67c601bd74ebe1f4de747850445a6dadb2436'


Trivial merge