merge of '5218b291289ff56a8d3f0caa1ddf13f84dfe516f'
authorKoen Kooi <koen@openembedded.org>
Sun, 18 Nov 2007 10:41:20 +0000 (10:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 18 Nov 2007 10:41:20 +0000 (10:41 +0000)
     and '8e25ce126ed9c9216d456d96f115eadd784f8157'


Trivial merge