merge of '2e1c605ca0c29e297c3422f1de81c581a6a42ed0'
authorKoen Kooi <koen@openembedded.org>
Thu, 31 May 2007 22:11:16 +0000 (22:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 31 May 2007 22:11:16 +0000 (22:11 +0000)
     and '78f88c31615c9cce59031db7596657c2afd18872'


Trivial merge