merge of c1749e31b60b984658b557139430b4fe8eb432a7
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Fri, 7 Jul 2006 00:54:21 +0000 (00:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Jul 2006 00:54:21 +0000 (00:54 +0000)
     and e1dfbc0aedf7759ad0b062d01ebcad3149da58f9


Trivial merge