merge of 'af4511b13e8cbd8513fd3d5de1d714c59d17fa8c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 7 Jan 2008 16:19:05 +0000 (16:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 7 Jan 2008 16:19:05 +0000 (16:19 +0000)
commit3dfff90e572be145ecee272dc0a7428042db2b33
treeb1c3aae98d0d234ed9565eeae0fd8d8536112151
parentf6f9406295f4119c89b900e5ee6cfd5bae470250
parent72057a15fdcd1da026f372637dc90498ab5be43c
Merge ... 'af4511b13e8cbd8513fd3d5de1d714c59d17fa8c'
     and 'c5064c11a779b0221a750ff7350a339c75859576'