merge of 'e7fcaa386e6ece8257005e7222964138b4ee8773'
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Oct 2007 12:33:20 +0000 (12:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 1 Oct 2007 12:33:20 +0000 (12:33 +0000)
     and 'f68cd62e66ec1f6d24dc3d4588abbc23993878da'


Trivial merge