merge of b41b048ca226620e98989f7e71c6b758b4cbaf43
authorHolger Freyther <zecke@selfish.org>
Fri, 7 Apr 2006 21:25:46 +0000 (21:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Apr 2006 21:25:46 +0000 (21:25 +0000)
     and ba0fa1662b1852ad4ed93d9e5cbbb939b90908a1


Trivial merge