merge of 311e1d1fc2eefa2efc02e72f033f7f8ff3d1099b
authorKoen Kooi <koen@openembedded.org>
Thu, 11 May 2006 17:22:12 +0000 (17:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 17:22:12 +0000 (17:22 +0000)
     and ea43be5f9ba4797b6cf391313e04bfb636e692db


Trivial merge