merge of 1d24ccd116b8a70c0a23a022713e88fbe6c83097
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 30 Jul 2005 00:18:01 +0000 (00:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 00:18:01 +0000 (00:18 +0000)
     and 585ac18d7511f158fae90c01f9583c6ce379805d


Trivial merge