merge of a56b1beed74d7cedad94cb2edd928cddbf3bf089
authorMichael Lauer <mickey@vanille-media.de>
Tue, 13 Jun 2006 22:35:28 +0000 (22:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 13 Jun 2006 22:35:28 +0000 (22:35 +0000)
     and bf11bb142f46acb4b38b498495dff52f4b77083c


Trivial merge