merge of '77df6e755fc8272db3fd5e4c3b0620b4453ca180'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:04:30 +0000 (10:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 10:04:30 +0000 (10:04 +0000)
commitc3be2a552db104291accd82b2e674d31d5527fcc
tree422e82bf481b26c2a0e883d60b459cbc243d436e
parent3a508238c49e86e0476319bfe71a24fdfdd56b66
parent4693c8ab28f246ce11a0b80b27ab6127aea14c52
Merge ... '77df6e755fc8272db3fd5e4c3b0620b4453ca180'
     and 'f0261ce1c4acd6350d91bdaaf2939442d84a222d'