merge of 62e43adfa95f28be56e88ed4588c52ea8b613b76
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Jul 2005 11:27:52 +0000 (11:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 11:27:52 +0000 (11:27 +0000)
     and 99b336970fe25f98faf47c5cb651ec42bf0897b3


Trivial merge