merge of 77fc8f2b5232044a734ff79b0bdd873ad80ec7c3
authorHolger Freyther <zecke@selfish.org>
Mon, 12 Sep 2005 19:10:29 +0000 (19:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 19:10:29 +0000 (19:10 +0000)
     and 94c19a6bdf6ad026dc99b955d02498220dd46166


Trivial merge