merge of 117df2dea7ad9414b4b470b52eeeb8c4685ccd24
authorMustafa Yuecel <yuecelm@ee.ethz.ch>
Fri, 10 Mar 2006 22:35:41 +0000 (22:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Mar 2006 22:35:41 +0000 (22:35 +0000)
     and 930d705be73a124e50d298df45974587c0ae98e4


Trivial merge