merge of '324341178a5782c39da0f446a612274d47105e85'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Apr 2007 16:12:11 +0000 (16:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Apr 2007 16:12:11 +0000 (16:12 +0000)
commit47bc36e2e46a485b80a73312af440fce6b28ae8b
tree20608d1e82b92c2c1e700834d2e1ca62f40c917f
parentcd2eadf880b94eaaa56e745a0b9b55ecbda0e194
parent40896f4a8f30bc6459fd7147aa43f4ccb4cb2146
Merge ... '324341178a5782c39da0f446a612274d47105e85'
     and '4182d55033155215cb92988f24e202551fc3da2a'