merge of 542b1a3d999b25674ade56ded685c4211f27090f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 5 May 2006 15:47:10 +0000 (15:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 May 2006 15:47:10 +0000 (15:47 +0000)
commit6938c5435a96be5dea0b4a62c9e74366dbd166b1
tree1a0a965b89471866886890ef6c9b8b158d06dabf
parent0c834c2aee9c6885b70dc83bf3636bd40c18a0ca
parenta2b3639487a5a337b833830ac1e9a1fa85315eba
merge of 542b1a3d999b25674ade56ded685c4211f27090f
     and b69c981e27fd4ef4c385796d80f1095b8859ce1c