merge of 0f2f529b92dbcf9e16ad45331308b7b059bfbfc7
authorKoen Kooi <koen@openembedded.org>
Wed, 7 Sep 2005 10:16:00 +0000 (10:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 10:16:00 +0000 (10:16 +0000)
     and 81fb073242cc3af84d2044617f4f235d8c219c04


Trivial merge