merge of 83ec6c603eb4d350be69c0ac3f03f8be63a970cd
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 16 Feb 2006 23:06:02 +0000 (23:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 16 Feb 2006 23:06:02 +0000 (23:06 +0000)
commite6f6ecb62b493d186fcfd302f1b60c886c68e55b
tree5b11d697bd2dbe3027d875fdbc2419a90c0d03df
parent707d0080cf23b6ba5cc632e60b0229031cdff90a
parent2128f1a94ded090ab6d135d31798e3ddb97b1bd8
merge of 83ec6c603eb4d350be69c0ac3f03f8be63a970cd
     and 96f792c135e95ff503266e442db17ede3ba27060