merge of 456405c150fc4438fcce5106fb54fe56ad592fdc
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 21 Sep 2005 13:45:27 +0000 (13:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Sep 2005 13:45:27 +0000 (13:45 +0000)
     and 8e9511aa1d63d9f8adab9f54242259e685e6a267


Trivial merge