merge of 88f7b26bd7167f4b01485d1936de4c7bba0a26ab
authorMustafa Yuecel <yuecelm@ee.ethz.ch>
Sun, 12 Mar 2006 19:34:33 +0000 (19:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Mar 2006 19:34:33 +0000 (19:34 +0000)
     and 9d3987c51ecb96e2da95a59c2c2fdce30384c802


Trivial merge