merge of 50ca43556e311a226bcabbf74fef8be758ad8982
authorKoen Kooi <koen@openembedded.org>
Mon, 20 Feb 2006 21:45:59 +0000 (21:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 21:45:59 +0000 (21:45 +0000)
     and 98e42d2d4e7f7bb636244875058f5bef36a594bc


Trivial merge