merge of '7766951901c250170ac71fd9268ec9c8e230e2e3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 16 Oct 2006 20:04:58 +0000 (20:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 16 Oct 2006 20:04:58 +0000 (20:04 +0000)
commite6ed86ffbe8a2d0697c8020fe19390ebc6a5ff74
treea7818d8bc6c22d272c220a185637a48db74d96ba
parentce74d56b9f3707e77bf725cbd7c0875650054087
parent23ad08e50769a49f28792375ef482c029bfc9a5a
Merge ... '7766951901c250170ac71fd9268ec9c8e230e2e3'
     and '96fb434736327df64b56d0ab9a6a36fcf759486a'