merge of 03b24ac5bbfd34988917e742c3d058a0e65c9cae
authorKoen Kooi <koen@openembedded.org>
Fri, 10 Mar 2006 22:24:53 +0000 (22:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Mar 2006 22:24:53 +0000 (22:24 +0000)
     and 89b41334d0c4e264e8d1a5cc4598404379f62dfd


Trivial merge