merge of '6ca0327eb664414f4653bb5a14758c9b8138fcff'
authorKoen Kooi <koen@openembedded.org>
Sat, 24 Mar 2007 17:37:22 +0000 (17:37 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 24 Mar 2007 17:37:22 +0000 (17:37 +0000)
     and 'a86f58519a8606f6e3391ba31cc52760ef709b6d'


Trivial merge