merge of 'f24ed430bf3ceb0d538a87543ba12756657e820e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 13:23:18 +0000 (13:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 13:23:18 +0000 (13:23 +0000)
commitaf3d7051e4e2263b884561d70b863374872a9dfd
tree1aa95b2bc02b315efb729bf1f414661441191aa5
parent60c0a0d84ac46b7e45a976f7985490caf6eeefa0
parent706a6e2b82d1ecab8f3301b2f82b3c491d203dcf
Merge ... 'f24ed430bf3ceb0d538a87543ba12756657e820e'
     and 'f9a7308abb2bdd098705726bcaf19639473187de'