merge of 123fcae9f3b7635a642fbb282e0ccbaa3101bd8d
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 4 Sep 2005 10:20:03 +0000 (10:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 10:20:03 +0000 (10:20 +0000)
     and f967ac0ac89db30dfae722cc9ed87e7fc46c136d


Trivial merge