merge of 'cc5142241e1e0788b16bdb07718b289a105ae7ba'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 16:30:20 +0000 (16:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 16:30:20 +0000 (16:30 +0000)
commit0b27b4d9b2b67bb2ab1c73c85b0f64423727baeb
treeb960688f7e90558666664bf5fdf7aaacfbb1f77a
parentf3352958d5c5bdb4da60ac99a1bd61008e6141ad
parentd35e9496da0999525f5d206e57bb659a77d3660f
Merge ... 'cc5142241e1e0788b16bdb07718b289a105ae7ba'
     and 'd9b88c514f27c48820b33f83a95c33539f78dddb'