merge of '1494fe26d3240d31000724d1c5a00aaf8566b48b'
authorKoen Kooi <koen@openembedded.org>
Tue, 9 Jan 2007 10:00:31 +0000 (10:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 9 Jan 2007 10:00:31 +0000 (10:00 +0000)
commit55154121e10ee33c81ca4e8a450d5633ae02d948
tree3e277bc10a6011cc04641eca20a6aa160f592058
parente18626a54db4ffff0a0841ffe0d50b42a1425321
parent70e1bf1a453e4d7968b4a4481cf7e203aa793f95
Merge ... '1494fe26d3240d31000724d1c5a00aaf8566b48b'
     and '28548b0eda864e1b3a44136bcced77ee8c1e9dab'