merge of '9f1fe2504c55293cd4cdd2e508adf582c8ae44c3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 10:07:19 +0000 (10:07 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 10:07:19 +0000 (10:07 +0000)
commit8f187aea627c997050e572e425ff4fd79c3ee0ca
tree96acfac8c3488482e592c51d4ecc0dfdc02f9d01
parentc7e33ecf737e93f9ecec2cc609064bfd593f2b61
parent5048be568ce4ce7a33d9560e73a324dcbfcf4455
Merge ... '9f1fe2504c55293cd4cdd2e508adf582c8ae44c3'
     and 'c33637ccb4f9f6285140370561048926fa0c712f'