merge of 'bea143d94e8d276b8e97bf1f82928984f2ac040a'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 21:55:22 +0000 (21:55 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 21:55:22 +0000 (21:55 +0000)
     and 'fc1c689a5d9b893171f7d1effdb3acf96ea757df'


Trivial merge