merge of 2f7b3d5a4cb419e012fd15bb7d621b195cd4bc84
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 26 Aug 2005 16:33:10 +0000 (16:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Aug 2005 16:33:10 +0000 (16:33 +0000)
commit74aa329f71e25ede9a5b222c952cd8d6cffca1ac
treecd09a6952e9dd725062a7857d1cb330eb7e1eaaf
parent6db9af183ca80355de788a848b58d8ef734ca5f6
parent8a4dc9207577a7999abffcb90527bbc44382e178
merge of 2f7b3d5a4cb419e012fd15bb7d621b195cd4bc84
     and 32b3aa5b585c31c96bc1f6e98bc36a1a56f87166