merge of 3d35370562671c5b41618274011689a1f8e4cf9c
authorMustafa Yuecel <yuecelm@ee.ethz.ch>
Thu, 18 Aug 2005 21:06:43 +0000 (21:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Aug 2005 21:06:43 +0000 (21:06 +0000)
     and a6b994aea0347efce0b57615068f903230d4f9d7


Trivial merge