merge of 384828c9ac96947ed787099eb14a15f49ebedcac
authorCliff Brake <cbrake@bec-systems.com>
Wed, 5 Jul 2006 16:46:46 +0000 (16:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 16:46:46 +0000 (16:46 +0000)
commitd8520f8034086c6a1ecc08b17d038448a6fef7ae
treea36ac87f9a70b11d3fe4b2ccddeb86f374880ec7
parentfaa278eb98418094bcc3b4b9b4f9f40747811293
parent1be1185ff9c0f9a80f5c76b06cfd7d1da06b56f6
merge of 384828c9ac96947ed787099eb14a15f49ebedcac
     and b3afec9600880ee22a3041769633491d0f81c427