merge of '0c14edad9fe9be01f3dcd8bb7481391246756938'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Aug 2007 11:34:53 +0000 (11:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Aug 2007 11:34:53 +0000 (11:34 +0000)
commit0c138f4a7131723db2a6c061eeafc13388f55bed
treef635f4b4420c23ef2f37ebd88c089ecb91e21a1b
parent6a95f5f018046d58290aa926c160222bad6821b2
parent25ff09c94a8f2faea23bfb20760a682bc6c03f87
Merge ... '0c14edad9fe9be01f3dcd8bb7481391246756938'
     and 'afa51d1bd3a6d0684595da996d34d4923676187f'