merge of '602d19aed9d02d401cb3e6abec9352a3eeb76eb6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 10:21:12 +0000 (10:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 10:21:12 +0000 (10:21 +0000)
commitd1dd8f567b4f6cb983d8a81e34e4ec2d56337eef
tree0958fb28d7a3136ef2609fcaf7a9367328d105c3
parentf0df9d59537253071f36813c5770f473fc810c16
parentdcb7c19ada78eaebd5831dc3c07107e136ce3f35
Merge ... '602d19aed9d02d401cb3e6abec9352a3eeb76eb6'
     and 'b55671f42355ca7d007393b54ff28e7bb5396af5'