merge of 46964b2367c68919c05de337c00dfb0f80a7bc6f
authorKoen Kooi <koen@openembedded.org>
Thu, 4 May 2006 11:58:17 +0000 (11:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 May 2006 11:58:17 +0000 (11:58 +0000)
     and 9ff24ed6ad4819ce51140dd2c4bd56863c7229be


Trivial merge