merge of 0491d3e3c337e2a3611d241e197e4bb3f0bcc2bb
authorHolger Freyther <zecke@selfish.org>
Sat, 27 May 2006 18:35:49 +0000 (18:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 18:35:49 +0000 (18:35 +0000)
     and 56ee470fc65db2cddfbe809ef76746929e1cc7a1


Trivial merge