merge of 65c6c7a1cf1b7e4160d7a1a4edee5f1cdfb017d0
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 24 Aug 2005 19:07:29 +0000 (19:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 19:07:29 +0000 (19:07 +0000)
     and e0add06e360adc0ac4763c1fe91d0166abfcb4dd


Trivial merge