merge of b1410ede664e298061d74b36181c097dd76a0b22
authorMichael Lauer <mickey@vanille-media.de>
Tue, 9 May 2006 12:33:25 +0000 (12:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 May 2006 12:33:25 +0000 (12:33 +0000)
     and f43c0bbb64e7f30530654a0eb2acb35a6b82ce97


Trivial merge