merge of 080644e9588853545b0a7f1ff6839082ba558f88
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Dec 2005 13:46:43 +0000 (13:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 13:46:43 +0000 (13:46 +0000)
     and e302bc56b46ca74429ac0c514ee30ee9429d78ea


Trivial merge