merge of '0f5fc910a03052e7b935c22cf24e1235f9cc1576'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Sep 2006 11:32:06 +0000 (11:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Sep 2006 11:32:06 +0000 (11:32 +0000)
commit2e3eb5b4d53e2adef9dfcc0d603935bba65caee8
treef95ee97d04d8b242e93a256f25bc38810d78734e
parent9c895f45a44309ef8f29497eb78d284e9926d59a
parent703f0544e914ff348fe794b7df21fe9ce512d796
Merge ... '0f5fc910a03052e7b935c22cf24e1235f9cc1576'
     and '7881a5c74b4a349705d81ae3d969459001a9e1da'