merge of '171b776054ba3252026d46710fb0cfcfe17c4c9d'
authorKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 10:52:45 +0000 (10:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 10:52:45 +0000 (10:52 +0000)
     and '711eee81007a255a1de4882597073f64879767fe'


Trivial merge