merge of '25f2070b6ff7c016172c18ddcbea754aeb7d159e'
authorKoen Kooi <koen@openembedded.org>
Tue, 22 Jul 2008 09:19:33 +0000 (09:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 22 Jul 2008 09:19:33 +0000 (09:19 +0000)
commit4ae90485f3dbfeddba93e7904d6cfbc89d53fe5d
tree03d5217d654c31ed7b57e140e2aebd02f8094c5e
parentf8a4782d36b59b457c49a86d6630de7a8699e36b
parent2bebd2a04ec828644f87505fa426758b6c74e10f
Merge ... '25f2070b6ff7c016172c18ddcbea754aeb7d159e'
     and '719f01c7bedccc565279537ecbfdbf8a61bd9a4b'