merge of 3a1f3b49721651ad51810489d8d2924c5e347a54
authorHolger Freyther <zecke@selfish.org>
Wed, 3 May 2006 23:34:38 +0000 (23:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 23:34:38 +0000 (23:34 +0000)
     and cb1b20a4461b3e3cbbc5d4c0596b25de8394246c


Trivial merge