merge of 6287535c46a3cdb7bc8a84eaeead326756fd3f98
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 1 Feb 2006 13:09:32 +0000 (13:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Feb 2006 13:09:32 +0000 (13:09 +0000)
commit57a0ea251c99054f1da88f4ae0233010a7a062e1
tree2782d6222bcd0e7ca92724de4d5691dcc6ca791f
parent1301f1dfdeeee12f1638386f161b0bac630f8e1c
parent4f53bb2d58aba4a382057369405e00b165b95f42
merge of 6287535c46a3cdb7bc8a84eaeead326756fd3f98
     and 99edbe0f3af53904ca2cb45c0849c1580b274a1d