merge of 81c701fb4af8296026067c0e6d6a33431d87cd78
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 May 2006 21:55:39 +0000 (21:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 21:55:39 +0000 (21:55 +0000)
     and 9e3733eb68c0fe66fdaa1fea2a1c364deec68678


Trivial merge