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)
commitd9b62f99005396a1d1f02649abe11574ccb31a82
tree9abe16e00744fecfc8fc6324e96cfc6184be821f
parent4ead106ddf5dde3d9b82e19928785d318f78cda1
parent9f1f24c7cee07d203af5a399d6b82ca2c44c1e04
merge of 852e43ffea417b36fb0ec4e3a883e91cb7960eb6
     and f0718c495b9b8c246565ee2c07956b9356eab01b