merge of f53e73238f903a9d33e92490cbd1cb8822fcf5f0
authorMichael Lauer <mickey@vanille-media.de>
Wed, 28 Jun 2006 19:34:17 +0000 (19:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 19:34:17 +0000 (19:34 +0000)
     and b6fd5d15175f87facba5c703b206a7c235ecaed5


Trivial merge