merge of 655c27b21e9a61ebe5a2012682a1b2fe05fd32de
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 23 Nov 2005 21:24:56 +0000 (21:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 23 Nov 2005 21:24:56 +0000 (21:24 +0000)
     and 6cd20908e73dce47aed78e3e9d4550408ac3f82c


Trivial merge