merge of 6f3628b0dba700cfacce31a608706bb638c5c134
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Feb 2006 09:58:37 +0000 (09:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 09:58:37 +0000 (09:58 +0000)
     and e7ddf084f75a5ee0d7e8ea106ce96c37362b4e64


Trivial merge