merge of '7ecf0e32974264619fa996b2de3f674cfe2ef705'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Feb 2007 08:23:00 +0000 (08:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Feb 2007 08:23:00 +0000 (08:23 +0000)
commit65eeb7f79b9be29aeb8d71052a763fa6de0723c0
treec31d204b0f260b5b1f6c12c3b1bbcd65bd5ffd26
parent57aa0d08cf93822048559809937dc266688a8389
parent7f343efaf3289b837b56229a4d4b15dc3f9eb276
Merge ... '7ecf0e32974264619fa996b2de3f674cfe2ef705'
     and '91440474738896e262f00721ea8c0887714b5e58'