merge of '8be7406d131a307bb409ca173b6b0bb55c092bc6'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 09:57:00 +0000 (09:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 09:57:00 +0000 (09:57 +0000)
commit7922c8985821d44774f248ab3bd73611163e7ed4
treecbd2981c25b607dea40ad82d0713e0810f4d5e2f
parent45c93cb1b9dc7f51e8270f6f9acd54921f2bc052
parent06fe60f64fa4d2867c888629f7580b3bfc5b61d6
Merge ... '8be7406d131a307bb409ca173b6b0bb55c092bc6'
     and 'd86d6413edacca9f55683204f6ec67098e2de319'