merge of 46e0039f24ae8a639a638dadeb0b8e88e8fb48b0
authorKoen Kooi <koen@openembedded.org>
Tue, 23 Aug 2005 10:39:17 +0000 (10:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Aug 2005 10:39:17 +0000 (10:39 +0000)
     and 7e0579c485fc3de6e06a10b9db460e3ba59cd9e5


Trivial merge