merge of 295b25bdccb71c5cb89674e861313d3fc4dd8aa8
authorMichael Lauer <mickey@vanille-media.de>
Sun, 24 Jul 2005 17:04:53 +0000 (17:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 17:04:53 +0000 (17:04 +0000)
     and 6311b4a3e3e4d0a0680848dadc193d5790149001


Trivial merge