merge of 3668ee2a346de324f1a080ffc39842da7fd5a787
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Mar 2006 17:53:33 +0000 (17:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Mar 2006 17:53:33 +0000 (17:53 +0000)
     and de8c26e5b67b458b3707756fe2ac783f52b889b3


Trivial merge