merge of 4d9248891bbabfcd869f50b24c59eb8d29c6c48c
authorMichael Lauer <mickey@vanille-media.de>
Wed, 21 Jun 2006 14:05:50 +0000 (14:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 14:05:50 +0000 (14:05 +0000)
     and 819d48f7dfdcf5e59b36b88b9b518d8d76d04f06


Trivial merge