merge of 'a675a323523cfdb282fa64bd2a0e42d19d71db33'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 14:58:39 +0000 (14:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 14:58:39 +0000 (14:58 +0000)
     and 'b67dfab13ef7114048f172a8cce5a15a5e2f5b07'


Trivial merge