merge of '0573649abd1cf5b9f42a282ceefd2a99912dae21'
authorKoen Kooi <koen@openembedded.org>
Mon, 3 Dec 2007 15:49:58 +0000 (15:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 3 Dec 2007 15:49:58 +0000 (15:49 +0000)
     and 'a5835e350969f436aec7b4c92890a1e73dcd6c3e'


Trivial merge