merge of aa208c78dc9ba6e2c8b7c157a2a98c6ea5f507fb
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 May 2006 13:00:35 +0000 (13:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 May 2006 13:00:35 +0000 (13:00 +0000)
     and f87d9b990300072e37071e6934f7af60c67bb40a


Trivial merge