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)
     and '134a95998779b68fe6328f19f104e5e83a05e716'


Trivial merge