merge of 190f2a680fcbd7ef0c24337df43378bded12f048
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Oct 2005 10:11:30 +0000 (10:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Oct 2005 10:11:30 +0000 (10:11 +0000)
     and 665676b78fde532560ccfc82e50fa0416cee55c5


Trivial merge