merge of '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'
authorKoen Kooi <koen@openembedded.org>
Thu, 4 Sep 2008 10:19:05 +0000 (10:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 4 Sep 2008 10:19:05 +0000 (10:19 +0000)
commit2c432184fd049be1ae22d659911d260e82deffa2
treeebea42b5f3856e2702e2f78eebe494f797557b8e
parent3c20604cd26ca8da11ac9afb669629c20355c4e4
parent5ca2a84590ca9ba602fb2e50a7c712e3525dd151
Merge ... '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'
     and '9ead7c7a970fd9cac9a8f7314036254e85d786dc'