merge of '31255ba5192f33ebbab0596e34dbb8754a1d6f5a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 28 May 2007 09:41:29 +0000 (09:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 28 May 2007 09:41:29 +0000 (09:41 +0000)
commitca79187d539606f0f6f967f6ef54dab69a145024
treed9d0be1b00da8981d79afd37554d161b62446cbd
parent61a8d355ffd60961e8bd5809bd3a8dd01a37483c
parent082de8231effc3db38d7c5d33b1457c54f6c69e0
Merge ... '31255ba5192f33ebbab0596e34dbb8754a1d6f5a'
     and 'eb91cd3982ac95a5691bfcc1a9dc860004185f3d'