merge of d4dacf3f494f19480484b5e0d7806960a0ba7909
authorMichael Lauer <mickey@vanille-media.de>
Sun, 18 Sep 2005 14:55:26 +0000 (14:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 Sep 2005 14:55:26 +0000 (14:55 +0000)
     and e957dec81b0871cd7d43333a923a3249859c91f7


Trivial merge