merge of 0ff64394ec8e55a962dae7598429db658db92ce8
authorMichael Lauer <mickey@vanille-media.de>
Fri, 12 Aug 2005 14:01:29 +0000 (14:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Aug 2005 14:01:29 +0000 (14:01 +0000)
     and 7d7503a076b2aa004a780c9f24769124a939d7df


Trivial merge