merge of 379077a1fae1f193142e23eba34b908f1c6c7491
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 31 Jan 2006 10:54:26 +0000 (10:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 31 Jan 2006 10:54:26 +0000 (10:54 +0000)
commitbf56c6de2afde559bd574d8a5b4238d883214f90
tree1ae23a6ff0a59106cafde91934fd73dfbe182de8
parent2bdfab6db684af1f3f12b1b3c38e1fe0ba419b99
parentb44dd0a06836a9483f90c82c8aa22440af9d9b1d
merge of 379077a1fae1f193142e23eba34b908f1c6c7491
     and fe1ec31f3dd593d62186ad1c3ebd437c7df45777