merge of 78fbed1dae12cc05db2a4773ecaa9e752733f733
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Jul 2005 22:12:54 +0000 (22:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 22:12:54 +0000 (22:12 +0000)
     and 811e0e1d1053a004286d73e1a2b3fb1a1d74234a


Trivial merge