merge of ae86a51b6b338f8674cb343b7489121aaf099abc
authorKoen Kooi <koen@openembedded.org>
Wed, 20 Jul 2005 07:08:15 +0000 (07:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jul 2005 07:08:15 +0000 (07:08 +0000)
     and f7ca9da6142ab119cb4999176caa84671258b1c8


Trivial merge