merge of 3a8d976edec8e170e572b6281c1d290e82e766ee
authorMichael Lauer <mickey@vanille-media.de>
Fri, 26 Aug 2005 09:47:31 +0000 (09:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Aug 2005 09:47:31 +0000 (09:47 +0000)
     and dc2238d7bd47c01641da36969ca532175cee09d9


Trivial merge