merge of '0fcb36ac99d9411a139d45f77b738646aaab2ebf'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 15 Oct 2006 14:56:14 +0000 (14:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 15 Oct 2006 14:56:14 +0000 (14:56 +0000)
commitde7e35e2cac6c09c195700a14e59775f732edb11
treef3ace83470c56c5229f10c9bdc4931dc62cf96ea
parente9209ce1af2831989d30ada8855bef83096c264e
parent4dd04de4d4ef4ef090338b045fff6d422bd83220
Merge ... '0fcb36ac99d9411a139d45f77b738646aaab2ebf'
     and '68939422dc88f64f4831bce0644266a1875c335b'