merge of '33540f0bfe9c570bf5e5c1a8ef55968815395f11'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Mar 2007 12:09:42 +0000 (12:09 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 7 Mar 2007 12:09:42 +0000 (12:09 +0000)
commit50c1815b204b70d0aed47ed98887fa602f8e36cc
tree7e8aaf237aa3eaea712c3788803008baefa4bd97
parent9c99469b7739b771ba4057f5dfa1f128747e2630
parent21be67cddd40050298bd28670a91cbd1df3955e5
Merge ... '33540f0bfe9c570bf5e5c1a8ef55968815395f11'
     and 'befbf7900e309702a3c2438dd7d214bd2cdbbb48'