merge of 1f08208ff3c43887e64b23c1f616b3c055f659f8
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jan 2006 22:43:19 +0000 (22:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jan 2006 22:43:19 +0000 (22:43 +0000)
commita106d6b8e80abd2303e40999149be09cdcbafc7c
treefcac9f3de2291070ac03e3e6361f45e25ab189bb
parenta1b4e5714a9b6356f8bf7f0e9fec10192c617aa2
parentb7855d0a35832d6f516078492850689cb6adfe14
merge of 1f08208ff3c43887e64b23c1f616b3c055f659f8
     and 5531936b9907566eaf1d648bfbcc4867ba699ccf