merge of '290a4d774320220c9ab2a3fa23f71d7277d2551f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 7 Dec 2006 21:19:07 +0000 (21:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 7 Dec 2006 21:19:07 +0000 (21:19 +0000)
commit02c25572a5c012d2687ba685ceddabe46b1fb616
tree95fab32cc19ddd41ce07edd9f613cd6ecf14fcef
parentcce430b8c52256141db1c1c38d2a7741514fbfdf
parent096f9e473e295d59b0768f17a313da1dd42aca54
Merge ... '290a4d774320220c9ab2a3fa23f71d7277d2551f'
     and '9bf79930fdbeb107188631d9e38d57f850e38c00'