merge of 048984452e3625e7ebd5e99419f289d1ea6a9d40
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 4 Jul 2006 09:47:33 +0000 (09:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 09:47:33 +0000 (09:47 +0000)
commit4529f12ab4c495e6d4790814f31a46b33ceca1e7
treeb028ea541efeea1aa1481326aae00c611d1fa2d8
parentf95b30588c16453d5f98e17b9b800b4d1e399b66
parentd1f207a2c3388bbbd8a6ff976603e679478533b2
merge of 048984452e3625e7ebd5e99419f289d1ea6a9d40
     and b160064c666a513a6ec76f7fd0ddbd5ee1d7a985