merge of 7d60c571444743e7ddfdd9c52895c6b38850a8e5
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 21 Sep 2005 10:19:38 +0000 (10:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Sep 2005 10:19:38 +0000 (10:19 +0000)
     and 9a585ac85d681727fb65515f8c7f6612395d0ffc


Trivial merge