merge of '54848140214b3d180243cd747004c124b89af382'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 2 Dec 2006 14:23:20 +0000 (14:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 2 Dec 2006 14:23:20 +0000 (14:23 +0000)
commitc90f9cc676882d2aca9c805f0587041c982cd26c
treef32a220b40bdfbc6ad01545db7fcf6234172a64e
parent33b89a79e5bbc471cc90643c1765842b60006c03
parent7d2d0f30feecb3852610f279af69e72fb1bf24d3
Merge ... '54848140214b3d180243cd747004c124b89af382'
     and 'd81c245727e82ac6bf504ee9f1084a1c1829c092'