merge of '6fa9ef4e1d87a14ef1a17903570daeb24f495240'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 12:50:42 +0000 (12:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 12:50:42 +0000 (12:50 +0000)
commit9b0b36a3555ff8e90f8add88a7532e698a177a45
tree113f5d3fcae5f5b2f7778232fa08e9a5a6c2829d
parentcbead186eb14da7990b40e2430fd86539c0f2545
parent2502c8cff3b98e311a88d35899592837ec64bf6e
Merge ... '6fa9ef4e1d87a14ef1a17903570daeb24f495240'
     and 'af90841f4497299774d1cfae17dd753a99956544'