merge of '4daaba2f11fe05c9110da986c3686dda10ecf49d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Mar 2008 12:05:39 +0000 (12:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Mar 2008 12:05:39 +0000 (12:05 +0000)
commite840869c3a7de0b9c30340a31520430ecfd6840c
treef7380109d547a186ffc84d2d1f8864d2c30bbd4d
parent1fe0c234104e11adaa92c55cf315799b90e731ec
parent4fb731958d0018c9b460ea70f415da010d0a7bac
Merge ... '4daaba2f11fe05c9110da986c3686dda10ecf49d'
     and 'cc76826650730818fd451d948e3c71f69cb38c41'