merge of '0d5ce889e37fadac205e4382869384682f077fe4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 23:12:11 +0000 (23:12 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 23:12:11 +0000 (23:12 +0000)
commit8cf6fb3da6302164a31d4c59394757ed5a4dce6d
tree052cca86536a1c2766f6908e561d61369736c141
parent52e511d3706902fe9ba21a4c870ea28fe3f2e41c
parent0821e6330f15e89289b351e0b5e21339598339ad
Merge ... '0d5ce889e37fadac205e4382869384682f077fe4'
     and '53b57e99c7bb239b5233e2fd5f7ca598c33cba4b'