merge of 25e31bea2d2b004a18c1cd7472201bf31309d94c
authorMichael Lauer <mickey@vanille-media.de>
Sun, 17 Jul 2005 21:48:58 +0000 (21:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jul 2005 21:48:58 +0000 (21:48 +0000)
     and 301d170c61be8d8a8e702068717e29a57ef2e4c8


Trivial merge