merge of 398c56ddec631f7498795808fb0abbc73ef60d0b
authorKoen Kooi <koen@openembedded.org>
Sun, 19 Feb 2006 21:09:26 +0000 (21:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Feb 2006 21:09:26 +0000 (21:09 +0000)
     and fdb266aeebd8da05f0c3b76a855ad56627c198b6


Trivial merge