merge of '0b6935355f7d83e008381e3bc46345a5f8c686d9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 23 Nov 2007 16:49:20 +0000 (16:49 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 23 Nov 2007 16:49:20 +0000 (16:49 +0000)
commit342c4173bb403b9fdaa9984f4f70a0ace263b4a4
treee96f7e771e20f8ed5a1049738103b3d0c13d4821
parent7d530507b6033d8e48e07cd111cde55c68837dbb
parentd5a61605b45d4e3521160262dab43f3d8dd0852a
Merge ... '0b6935355f7d83e008381e3bc46345a5f8c686d9'
     and 'e48283e1dd58b2449622e99ee8018852bac6e0fa'