merge of '21f4ee6d8fb062180d2dc43b1e650ead520ca0a9'
authorKoen Kooi <koen@openembedded.org>
Fri, 2 Mar 2007 16:42:24 +0000 (16:42 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 2 Mar 2007 16:42:24 +0000 (16:42 +0000)
     and '449ea8e45f6398be01dd6f681846b2c1f8a10c67'


Trivial merge