merge of '8961e177cdb0b701e3bb0304ec24d5c4a3947254'
authorKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 16:13:30 +0000 (16:13 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 31 Jul 2007 16:13:30 +0000 (16:13 +0000)
commit3aecefc3fec909cf0b8208a345b98be27de068aa
treeeb82fe31ae0bc53f4f1eb0184c4d41700aa2237b
parent0adc9ee1289b5437b6386a44060117a8a5207f01
parentd6999084ed62711f579370df6cd739e217cc3d15
Merge ... '8961e177cdb0b701e3bb0304ec24d5c4a3947254'
     and 'e3756fffb6fe48cc7854ecab0ddfe07c21359f15'