merge of 67d2c7e1bf087c7c007705c24cae5ff93bd007be
authorMichael Lauer <mickey@vanille-media.de>
Thu, 8 Sep 2005 14:37:27 +0000 (14:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 14:37:27 +0000 (14:37 +0000)
commit4d10be8ca4cbbebf2b74447e8d8ab45e7ef9b714
treee979c7bd3b76435a31b4173900a8ce95485dcba7
parent0821a7ef3eb1e2b862c5cf8d1821850c4a14c741
parent0cba1cb3b9f68280a96055f281ff75b466d15313
merge of 67d2c7e1bf087c7c007705c24cae5ff93bd007be
     and fbd660b279924b2d0ef656f652497ca4a3fd3787