merge of '004380a4e5b2e3e1156fd497174eb001676bbc8a'
authorKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 10:14:28 +0000 (10:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 10:14:28 +0000 (10:14 +0000)
commit5a92b89f74247ccbfb54ec50f9a6ea6cb055d37b
tree233e29a92250fe66ad0f65007e2258f5f352baf3
parenta67b76f4c4dd74ce56cbba316a2e3bfeaf4d2617
parentc4d2a1e3fc39b16f04c2703889c3be672720578e
Merge ... '004380a4e5b2e3e1156fd497174eb001676bbc8a'
     and '134a95998779b68fe6328f19f104e5e83a05e716'