merge of 210506ba1cbb231216c4c537654bc61f30cdd6d5
authorKoen Kooi <koen@openembedded.org>
Mon, 10 Jul 2006 09:16:37 +0000 (09:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Jul 2006 09:16:37 +0000 (09:16 +0000)
     and 41c57842bfc16f4853d0f673eb4db65930ec7085


Trivial merge