merge of '7cea498c89cd9f4506bd1ed4ce852d868e4e299f'
authorKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 11:48:39 +0000 (11:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 11:48:39 +0000 (11:48 +0000)
     and '8ee8043c51d4de884f7d0da4c909abebb6e6356f'


Trivial merge