merge of 3d66f5adca4bb88d74e07587eafa41c603b98fc5
authorHolger Freyther <zecke@selfish.org>
Fri, 19 May 2006 18:56:24 +0000 (18:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 May 2006 18:56:24 +0000 (18:56 +0000)
     and db35473bb38fcebbef8e336933b5ea5ed873b886


Trivial merge