merge of a09349c6898e30d65e9c452702bf6dc94421c65a
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Aug 2005 19:18:10 +0000 (19:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Aug 2005 19:18:10 +0000 (19:18 +0000)
     and a94e401d7ca06d35832879717f90f426d36548fc


Trivial merge