merge of 7b99c91d607aaec886913e28b8d90df3ea56d5d9
authorKoen Kooi <koen@openembedded.org>
Sat, 20 May 2006 17:22:56 +0000 (17:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 17:22:56 +0000 (17:22 +0000)
     and d9c4abd064b8662fdf4ba0a5e24699fc89ce51f3


Trivial merge