merge of '171104fab4f21e3a390cb753995beffa459843ab'
authorKoen Kooi <koen@openembedded.org>
Wed, 26 Jul 2006 14:22:08 +0000 (14:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 26 Jul 2006 14:22:08 +0000 (14:22 +0000)
commit93ad5af574d5e0255f30f368bac17efef7f8a9fc
treedf35f262db34abc61e9f183604cbce0736ad50cd
parent5bcb1684fec353a5a6e33c3766854bf57b743943
parenta002709ec3e0ff976095c15604a4e53df53eab19
Merge ... '171104fab4f21e3a390cb753995beffa459843ab'
     and 'f1ae9d5e5629b09643d5895312ada9a356e6b700'