merge of 0606dcf3992ccdc92086d57afe0c18d2e7866ca8
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 16 Dec 2005 12:24:36 +0000 (12:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Dec 2005 12:24:36 +0000 (12:24 +0000)
     and 2f99d3226152a1a31655c50ccc4bca080bac9e82


Trivial merge