merge of e0ad7669467beb214dbbaa5169e94b07b29044c8
authorMichael Lauer <mickey@vanille-media.de>
Sun, 14 Aug 2005 17:37:03 +0000 (17:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 17:37:03 +0000 (17:37 +0000)
     and fadeaf2a4abec5f30afab4e5e8519a1687ee6116


Trivial merge