merge of 0a8833f5024cfc86b8e7c6e2159a0a8aed542cd9
authorHolger Freyther <zecke@selfish.org>
Sat, 6 May 2006 11:18:06 +0000 (11:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 May 2006 11:18:06 +0000 (11:18 +0000)
     and 4fda81bf37e6225cd6eaae6a16687a5cef9a47a1


Trivial merge