merge of 31484b3a457e2e2ecbac527a3655dd4adcd81277
authorccsmart <ccsmart@smartpal.de>
Fri, 16 Sep 2005 14:41:09 +0000 (14:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Sep 2005 14:41:09 +0000 (14:41 +0000)
     and 36fdf65c91bd73e2934ded7c2f8bdc1714cfa51e


Trivial merge