merge of 1892913050b4a9d4204f2fb9202f7cd6d84c0e99
authorKoen Kooi <koen@openembedded.org>
Thu, 25 Aug 2005 12:57:21 +0000 (12:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 12:57:21 +0000 (12:57 +0000)
     and 4658c406381ad92cb210db3eab6524bb631a717d


Trivial merge