merge of '08741953caff388c0875d0ab93ac3409dee8f1a2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Mar 2008 19:14:07 +0000 (19:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Mar 2008 19:14:07 +0000 (19:14 +0000)
commit3df1caaa46fdf9a05ca01e642bcc41d4c4dec349
tree7814451c527f9ea1f17ba2ae0fd88655651b37ed
parentf60de8368154bdc3549b11911d09f3e6ccd81042
parent8810fa39e0f43199cd3b2f494e6798577ee9fb03
Merge ... '08741953caff388c0875d0ab93ac3409dee8f1a2'
     and 'e8194e4192e392d230ab779c662314391f3e6ef0'