merge of '59341f601c1006b473e6599023cd3870fec6ff99'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:20:40 +0000 (15:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:20:40 +0000 (15:20 +0000)
commitb240c3833bba21fb66e1cd4c60902d73f2937846
tree5721d3efbb262eb5a9c2ef61e2f23e17f0156f13
parent1dae69bdb0d41e96655d849de94b85d4fd6ccfda
parenta56af0e28abb819387d23c156ca5312f2d13984f
Merge ... '59341f601c1006b473e6599023cd3870fec6ff99'
     and 'eb5211066eab924478ebbdc53748a8615e528b02'