merge of 086de75a7766964d8f97bff13a302c1f7d3c9fde
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 27 Sep 2005 12:17:53 +0000 (12:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Sep 2005 12:17:53 +0000 (12:17 +0000)
     and a217dce7baca7e22f86820e3810735a0c44c83ff


Trivial merge