merge of '381386545295748802d49e020def79338aa8d301'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Mar 2008 10:47:25 +0000 (10:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Mar 2008 10:47:25 +0000 (10:47 +0000)
commit47a07d0845784c149a4333b05fa001afc5f9b375
treede0a5e7596e5b60cccc0ed5654d0379a3e9e57dc
parent86b97ee454f147ead453e3d4a26d8392df22769c
parent4beb295426437090e24f7dc8b17dc4dda6e6b02a
Merge ... '381386545295748802d49e020def79338aa8d301'
     and '49e647037a07cbb223a15ef77511f87636080be4'