merge of '325cca716bfbf3db0f668af761161a7b40a705e8'
authorKoen Kooi <koen@openembedded.org>
Sat, 21 Jun 2008 12:19:35 +0000 (12:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 21 Jun 2008 12:19:35 +0000 (12:19 +0000)
     and 'ea9bece0e1c09d6d7e85904db6d8adeb4f4588c2'


Trivial merge