merge of '0f8f649521fff401e2d8ec3f053ed9378b84ad4d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 May 2008 19:18:21 +0000 (19:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 May 2008 19:18:21 +0000 (19:18 +0000)
commitd82555ebf7922a53a0ae5d3307fc6773f1125f26
treefe71bc55e04621a17f0c531cce16fa0409a82027
parent494d7dee7a6aafc87f218a6b2643a684c1fa097c
parent2f0a1dfa7bc08742a457100062f2300fdc6c97b1
Merge ... '0f8f649521fff401e2d8ec3f053ed9378b84ad4d'
     and '737ced6a79f80f5d666816c42ce1938783ee1494'