merge of '0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 18 Jan 2008 15:14:24 +0000 (15:14 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 18 Jan 2008 15:14:24 +0000 (15:14 +0000)
commit4801c8709e4ac47a1e633137b5b6355b3f85ba97
treef23b578f7dd5fb58c2218ff96b3ed3d0554af9c9
parent936f218c36509a98d9d587a7918f2a33d1441d91
parent152b2356da321927d953a1279e2288f37931a896
Merge ... '0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec'
     and 'cc72cefccea1756ea052a54b2ec73e0ef6e3d9eb'