merge of b9b3b3f5835946b0838fa649c358e5f9df8ef861
authorKoen Kooi <koen@openembedded.org>
Fri, 5 May 2006 17:13:42 +0000 (17:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 May 2006 17:13:42 +0000 (17:13 +0000)
     and dbfa3b1481e36f9d201ed1307a587ea91cd36cd2


Trivial merge