merge of 852e43ffea417b36fb0ec4e3a883e91cb7960eb6
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Apr 2006 20:07:17 +0000 (20:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Apr 2006 20:07:17 +0000 (20:07 +0000)
     and f0718c495b9b8c246565ee2c07956b9356eab01b


Trivial merge