merge of 68c930a87450b83ee412109725aa2845c4653e11
authorMichael Lauer <mickey@vanille-media.de>
Thu, 29 Sep 2005 12:12:05 +0000 (12:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Sep 2005 12:12:05 +0000 (12:12 +0000)
     and 6b859f9dad018680c0cb717f227911f81f1ba1c8


Trivial merge