merge of 5b224b4c91dec0b22ff45bec26fb18a01889e139
authorMichael Lauer <mickey@vanille-media.de>
Fri, 16 Sep 2005 19:33:18 +0000 (19:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Sep 2005 19:33:18 +0000 (19:33 +0000)
     and d2f84a64a7e1bb56cc4b2e67eec15019f5e59084


Trivial merge