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)
     and 99edbe0f3af53904ca2cb45c0849c1580b274a1d


Trivial merge