merge of '26245e99077b235e93972cec78f5b1d81619d8b9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Jan 2007 16:07:16 +0000 (16:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Jan 2007 16:07:16 +0000 (16:07 +0000)
commit9fd97ae2b9176b190227b4b668dcb45b76a3583e
tree863661de5e1fce816ec29bba51d19215fef11f48
parent3d622bcdfbeb990189ff73bfe771cd3779162e49
parent04c82c564cf19befb33b15e2513dbb67fc1de61c
Merge ... '26245e99077b235e93972cec78f5b1d81619d8b9'
     and 'e60c1cfca0f9542d72d19b149aa9b423b5656afa'