merge of 5ae8db073bc2bb13b71406d13b300a0da7091653
authorMichael Lauer <mickey@vanille-media.de>
Mon, 1 Aug 2005 20:05:07 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 20:05:07 +0000 (20:05 +0000)
     and 5fe78440967952c99c9ba1267d694ee7983611cc


Trivial merge