merge of '365d8f133c3f7699978ee00c41919fac8d53bd47'
authorKoen Kooi <koen@openembedded.org>
Fri, 20 Oct 2006 12:30:29 +0000 (12:30 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 20 Oct 2006 12:30:29 +0000 (12:30 +0000)
commit0a77cd9448bc221c366fc4a2cf0a93addb50e21d
tree2c7866bf4a2a4d3c4641ea962dc60167e832c032
parentbd1ecc5eecfb2ab5f8e6c5686cfbd60c023194af
parent1e671c11a8b6f140e11b9cb38c3728cce90f0665
Merge ... '365d8f133c3f7699978ee00c41919fac8d53bd47'
     and '8ce31384f7196aabf3284f45ea6f9fc66d2c49ba'