merge of '497bad113a4cfe870e10990d7361bc8a266713e5'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Sep 2006 21:40:13 +0000 (21:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Sep 2006 21:40:13 +0000 (21:40 +0000)
commit680de2841130d3a7e079b0d81e0aa290d109a2ca
treea83fd5ef292b250ce473b4e103c2975ab04a142a
parentae3df8736aa5aa88b9c7d7f52f2265bf1fb24ef8
parent188250803922b2887bf4f6b66f9a88d4f49db75c
Merge ... '497bad113a4cfe870e10990d7361bc8a266713e5'
     and '7f3fc45ed4f6bbc596b8513870bdaa4ecc6576ce'