merge of 59ae9726b5fbfe541edc28700acbc17ed11a9672
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Apr 2006 13:09:00 +0000 (13:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 13:09:00 +0000 (13:09 +0000)
     and d93900aa884b52d778b478749eeafadb6bef3a21


Trivial merge