merge of 776c1d678f47c9a56a592cc06a10d2ca9e415611
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 30 Jan 2006 17:30:27 +0000 (17:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 30 Jan 2006 17:30:27 +0000 (17:30 +0000)
commit9b6473858644146a940a2f3c6d65f454ae9a674b
tree411a5c2dd7fb4ec60cf6c2635f59107a90a2342b
parent2b6a970107729ca3d3a37c762c8fc8308a1ae031
parentb8a997b5ad70a60f3e5400cb33fd642b0ba3759a
merge of 776c1d678f47c9a56a592cc06a10d2ca9e415611
     and 86dda2fd06e3964978bb4d3424cb481531b26acd