merge of 25f8c526f6726d19c4ef8cfc766c7666c58c3c4c
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Aug 2005 22:02:30 +0000 (22:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Aug 2005 22:02:30 +0000 (22:02 +0000)
     and 3c94be02c338e9f42138bc4421a6de729400db41


Trivial merge