merge of '575362d4559ed152d30fb5c13f83010cf658bf44'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 7 Dec 2006 20:27:31 +0000 (20:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 7 Dec 2006 20:27:31 +0000 (20:27 +0000)
commitcce430b8c52256141db1c1c38d2a7741514fbfdf
treecdd2c56f2388bc0274ca0d3e99f000e21951b15d
parentc7054f8e2ab6ea711d14b48143491cb1e82c16df
parent7750489c8ad1c7f8e8a425b3a6f84bf5c92a8981
Merge ... '575362d4559ed152d30fb5c13f83010cf658bf44'
     and '5d137a82f802924d6d6e3a578800021b392244d9'