merge of f53e73238f903a9d33e92490cbd1cb8822fcf5f0
authorMichael Lauer <mickey@vanille-media.de>
Wed, 28 Jun 2006 19:34:17 +0000 (19:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 19:34:17 +0000 (19:34 +0000)
commit68c4acbeeedda4db03576b46f5b1ef3ff44e10d9
tree75fe5d99089e1708071fc4178df2329fad2c981f
parentbb7cd179d391d9ebc2c4f1a4a7b6de0cf68a08ec
parent7ac0e9d07429726f0c0ecd46db92ef8c46722bc8
merge of f53e73238f903a9d33e92490cbd1cb8822fcf5f0
     and b6fd5d15175f87facba5c703b206a7c235ecaed5