merge of 111dbb3712f3bbac846e3e549eb3c6e357055206
authorMustafa Yuecel <yuecelm@ee.ethz.ch>
Tue, 6 Sep 2005 13:17:02 +0000 (13:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Sep 2005 13:17:02 +0000 (13:17 +0000)
     and c0ba0c807efb6a1e8cc5c794ef33c6a91e35c2af


Trivial merge