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)
commitc6a46d9fc00dccc78b3543ee6c5b62f856bc4c86
treefa46636f8c4430d89af0ff3559a98d42345bd07c
parent5aaaaa5942b4a928a34bf3804a3cf8cc302be4f8
parent0758358b14b63d166784e5163682f9dc72b49a0e
Merge ... 'e7fcaa386e6ece8257005e7222964138b4ee8773'
     and 'f68cd62e66ec1f6d24dc3d4588abbc23993878da'