merge of 29709b7d5d5e2ec13e3b1968de4a6da6f657adbc
authorMichael Lauer <mickey@vanille-media.de>
Thu, 18 Aug 2005 09:46:07 +0000 (09:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Aug 2005 09:46:07 +0000 (09:46 +0000)
     and b81b0e61bfce121f10d42e327ea1df89155f5110


Trivial merge