merge of 7d1c333a7a53d6a178e09f1c4d8fc0ea9d243f7b
authorKoen Kooi <koen@openembedded.org>
Fri, 2 Dec 2005 17:37:16 +0000 (17:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Dec 2005 17:37:16 +0000 (17:37 +0000)
     and ee7a6ae9f04d3b86e0a6b611e45b6380c8c337b2


Trivial merge