merge of 3326cffb0ca8c0f56ab7a6d5a6463619e0c7f74c
authorMichael Lauer <mickey@vanille-media.de>
Tue, 30 May 2006 12:56:21 +0000 (12:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 May 2006 12:56:21 +0000 (12:56 +0000)
     and 7ee491539303aba051eb53badf6dc2cf39797dfe


Trivial merge