merge of '7d9f2813538bd9530788139c9fb3fcb1e0264065'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Apr 2007 16:12:20 +0000 (16:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Apr 2007 16:12:20 +0000 (16:12 +0000)
commitdc507d94349e85086efce828fb614d2a0d79cde9
treed85bef5afb2e9b942bed1a94a916fd71dadfc652
parent47bc36e2e46a485b80a73312af440fce6b28ae8b
parent86f1ccf58b2eab92ff7e65d9fe53ebcecc94bd5e
Merge ... '7d9f2813538bd9530788139c9fb3fcb1e0264065'
     and '884408d7b0ae3dcb9e1bd3607711aa6d13167c4d'