merge of '5d8c39ff16936c56ad5426172b300fff2de24c42'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 21:28:54 +0000 (21:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Mar 2008 21:28:54 +0000 (21:28 +0000)
commitc4e170a74a49088a234db4cbbcab10210a8fbb3a
treef2e91d439b55a864afbc20f7db2d939c8de540b9
parentcb76836f0eaca482c2420beed1e27ca224e34055
parentd3bbd28f22fbd8e9d097081fa128ae18197f36e1
Merge ... '5d8c39ff16936c56ad5426172b300fff2de24c42'
     and '86618f966282489d43b51fbf0ee93b954ac615ae'