merge of a827766397c44459630ecda3cc16b9032793e8ea
authorHolger Freyther <zecke@selfish.org>
Fri, 28 Apr 2006 19:48:04 +0000 (19:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Apr 2006 19:48:04 +0000 (19:48 +0000)
     and c37fe2bd8ae0d4fdfad59e04d8f2395c6238ffb5


Trivial merge