merge of '11ca7ff0d1de076bbdbc992cd8000979481f9ab7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 21:41:37 +0000 (21:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 21:41:37 +0000 (21:41 +0000)
commit60c598e86c024c26b624bcadc74855f24e3fb9ff
tree73e32c4d36bf1af34a1b206f12d4b46d75fee775
parent6d1aa775095bbfdcca40e561d58caab07cf1e5d9
parent134f2a28e8b491de63dfa26d32c6e6c9b01e520d
Merge ... '11ca7ff0d1de076bbdbc992cd8000979481f9ab7'
     and 'dcdf37dd5cff1f2afac0d3847f56301b4ae82c89'