merge of 'e4ac19c8fb4b1bbdef43e088c2683bcbf2c68ce4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Mar 2008 16:37:50 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Mar 2008 16:37:50 +0000 (16:37 +0000)
commit90a5fc5dde5704dd8c44f02d12ca408e8ee5cb37
tree755b024661f452a1ceae71d4057cf7f14c64f1e4
parentd5a54170c942d3d95eebb37fdeb3adf6cf881f94
parent27bd9f69e3e8ab71939886275eda2ca1d2179506
Merge ... 'e4ac19c8fb4b1bbdef43e088c2683bcbf2c68ce4'
     and 'f0eacab861487e4f57866eb471b16e78a2167a7e'