merge of '56ceab0da14ebf9acac5e367a5e2300e7da4882f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 12:48:48 +0000 (12:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 12:48:48 +0000 (12:48 +0000)
commit887638896b30cd32ac192b4b4d4c2db4b4ac1a7b
tree609d0ab60a698da610222013390151029b8b5c9b
parent811497e3db13d3bb9e53c6533d018678dba6ecab
parent789d877abab35a18bad1cc3d2b1895322021299e
Merge ... '56ceab0da14ebf9acac5e367a5e2300e7da4882f'
     and '9235652d1f961fc07ff7bc1997a38323e8c46039'