merge of 5d0bf12db458113fa06f91798e1362090e49ba8f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 3 Jul 2005 15:49:26 +0000 (15:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 15:49:26 +0000 (15:49 +0000)
commit70b04cd4873a7bd9604e1ead52809b3ce88092ca
treec728117181468d51cf5c15826342029b6a8ceade
parentfd009c38ded8c69bb161b828d5f0a83227115c07
parentcfb5aafc390f2661bbddda19abce1ac512cd31b5
merge of 5d0bf12db458113fa06f91798e1362090e49ba8f
     and 88adaace5b8cfe88c5164b75dc29d943a114c8f5