merge of 4b06abdf57f4120c272429171977e1efd7378926
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Feb 2006 22:23:36 +0000 (22:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 22:23:36 +0000 (22:23 +0000)
     and 8fb0e135d3da67bc1fa37bd6ad67902d8cf02bcb


Trivial merge