merge of 'a5d35e3e38233fd826ddc91736038e0e93f9ee84'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 15:23:17 +0000 (15:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 15:23:17 +0000 (15:23 +0000)
commitfa11c376ba9e1a8d05d9d20bc50608f45d687dd0
tree450a014b33001eaad63644d4414a57c3e36a5149
parent0c4549cead750f8f461490c720a5e3121ea96d10
parent9ab5ce1216e60759d29cade01dc4ba26a5304af5
Merge ... 'a5d35e3e38233fd826ddc91736038e0e93f9ee84'
     and 'b6c0786ab5d67f257974d8b40c940fcb2be0b6e8'