merge of 2e5f74aaab40ef75a6f2fc3a1957ec9e64efe919
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 4 Jul 2006 11:23:17 +0000 (11:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 11:23:17 +0000 (11:23 +0000)
commitc5e967b3c4b8fca10803c391d0e15c71cfc9aa4b
tree8fa32665630afece64fdb587e0a90ba0fa5e7912
parent0664707090a729d50f4a9358325f23a22bd9e471
parentd649adfcaf691303147f0ac30a41ec1f0ba8394b
merge of 2e5f74aaab40ef75a6f2fc3a1957ec9e64efe919
     and dd117e97833aeb9cbc87f3bda3749aae2426d332