merge of 655180ca822fd77b58f585a3b13300acdaedb1cb
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jan 2006 19:53:30 +0000 (19:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jan 2006 19:53:30 +0000 (19:53 +0000)
commit9db5d004ab478d2dfde46a021b1c3d2cc3bd38c8
tree1a1ba0ef6d4f10c602957a478163d8cca51779cf
parentb165eeeec947752950064a60449e2a41f9dd3c7e
parent0604f950c69206b1c00d519097810f1a0030059b
merge of 655180ca822fd77b58f585a3b13300acdaedb1cb
     and b6b0df140fe53ce37d902d8cc41a838a4abc1b7b