merge of 079fcd329857f0a9c2515a187110ac87377cafd1
authorKoen Kooi <koen@openembedded.org>
Wed, 10 May 2006 19:06:25 +0000 (19:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 May 2006 19:06:25 +0000 (19:06 +0000)
commit48faf1fb0846af5a9cdd66d9b0761edc9bba3ba0
treea0699ee08049114699061faf98b067d23e0d77bd
parent1f4b85e7578cda25dd41a01eb5717dab5e9301a8
parent4c1d9a4b020118617e2c19f445717b1eee28950c
merge of 079fcd329857f0a9c2515a187110ac87377cafd1
     and 283024b09313f04ab41944556c579e5bedba69c3