merge of 80526ab06e22a8188d5bbf6c96c91a93e182c7c9
authorMichael Lauer <mickey@vanille-media.de>
Sat, 8 Jul 2006 14:29:36 +0000 (14:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 14:29:36 +0000 (14:29 +0000)
     and 8ef2255951429792652b6d09bbad4841a438e89b


Trivial merge