merge of 2e8724564f1be9e0e883e070fe0666659493959e
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 3 Aug 2005 18:53:33 +0000 (18:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 18:53:33 +0000 (18:53 +0000)
     and 40fe86e812c95b7e5f5a1062bef6156d8d2f77eb


Trivial merge