merge of '0fb6c6e17d53f8f9619779a7259b3225d01cf28d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Dec 2007 17:50:18 +0000 (17:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Dec 2007 17:50:18 +0000 (17:50 +0000)
commitbf12eeb7d990c04245634376a596dff6984e46fe
tree035b19c5af0cde2fb59714ae04305c9f6adc3d9f
parent20f081f50569670fdc7088d711ed2bd34b2bb11b
parent8566446a290a001af86878b25590d92dbcddc028
Merge ... '0fb6c6e17d53f8f9619779a7259b3225d01cf28d'
     and '1a6625be75631d7dfb75413cb256eef5afb4d507'