merge of '13509c938fd1a99107093b57954661739e7c0d13'
authorKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:48:13 +0000 (10:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 17 Jun 2007 10:48:13 +0000 (10:48 +0000)
commit721bd132d7d9c3279d34160cb1beb15b3aba7565
tree9d4d9b6526d052aa52cc3c0e2b780be80f2d27dc
parent5e95c99add299d451cdbfec709231c89a7e98c69
parent04096d5a594548b00c268151abd5542091b7101b
Merge ... '13509c938fd1a99107093b57954661739e7c0d13'
     and 'ccf6618308437769e6e810b1fa60e3d0e565e1dd'