merge of '31db29464dd50bf11190fd9efbeaece3d3e83025'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 19 Dec 2006 16:31:59 +0000 (16:31 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 19 Dec 2006 16:31:59 +0000 (16:31 +0000)
commita4f2e81674c1de8e29d4c03de851a2d133536688
treed9337d056268961a54c3aec8663317cb0e8f6656
parent140a75f9a84e0071c8b6585083f51cd1ee279e16
parentd99eee4f71dd48a3f6cf67e90fb6b4b076b2eebf
Merge ... '31db29464dd50bf11190fd9efbeaece3d3e83025'
     and 'c4e8134bca9407021f67cdf9cd64c63ed7bd009f'