merge of '0b5587edb6c37bedf357b56ee1438f317f10673f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Sep 2007 14:04:35 +0000 (14:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Sep 2007 14:04:35 +0000 (14:04 +0000)
commit3ba3acf6374affbaf7e7eed45c59225e307b809c
tree297e91843d838c972e50484360f61011571aca3e
parent8ba324c9581d435fd728cddda6a5f59740bd3dac
parent7217b0c316ec2caacf1d1d7d8eeb539f86dc16e0
Merge ... '0b5587edb6c37bedf357b56ee1438f317f10673f'
     and '862b21d8f8b53f723771b71216302b89245e8b8a'