merge of 4689c198b9377662259edcd5ff48375cfb709ee8
authorMichael Lauer <mickey@vanille-media.de>
Mon, 15 May 2006 10:07:06 +0000 (10:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 May 2006 10:07:06 +0000 (10:07 +0000)
commit768983d3ad295a7367866b02a907b49e47f1b2e0
treef2490dbc2c7d37cfa0ec0440368ff3c01a64df39
parent48a9f1a65c713fa755d459546f34944c16e9124a
parent62b8a8d46285a1439f1447a37128e94b2ef03ea6
merge of 4689c198b9377662259edcd5ff48375cfb709ee8
     and 844655bde85aa0ff998861d8efaf849b632b4b66