merge of '33643184403d6444039a75b310bad85488126b9c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Aug 2008 13:01:40 +0000 (13:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Aug 2008 13:01:40 +0000 (13:01 +0000)
commit0352656061f8be63e4f3c08bbce8beceed86be64
tree7c653529235a0d4be0f5f74532b17c71ca92325b
parente5796acb7446b205e796f485b990e52223c5be4e
parent7355ed5cf9bccc66c5a2c4da3be04e952020edd3
Merge ... '33643184403d6444039a75b310bad85488126b9c'
     and 'f42614d85ff9d52577c1148c8d8b6445ec2909e4'