merge of 05dd4ce9d2ee0995688e45e60a21534114fbc45f
authorMichael Lauer <mickey@vanille-media.de>
Mon, 26 Sep 2005 17:07:08 +0000 (17:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Sep 2005 17:07:08 +0000 (17:07 +0000)
     and 58382d22f4140021f828ad1271f9f7700cde6b0c


Trivial merge