merge of 381f5ac539b0a5bf9d03cdb31e3c77d0803fb3f5
authorMustafa Yuecel <yuecelm@ee.ethz.ch>
Fri, 30 Sep 2005 22:57:00 +0000 (22:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Sep 2005 22:57:00 +0000 (22:57 +0000)
     and 70ec7862f974597074cd12195d073365fec9c88a


Trivial merge