explicit_merge of '4971f280898b867f9204503887a01d98da03a5fe'
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 3 Jan 2006 21:51:32 +0000 (21:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jan 2006 21:51:32 +0000 (21:51 +0000)
commit7d542955fe0d78730e280e586a03daffd3c1d527
tree96e9607021e6a73d040a986b12d053a3170dfbc2
parent79546c8dd2e0f2e90eb663cfcf3e4cf58d09086e
parent4847e67a9d7017db9a9e83d849e9f98c8a9b5ad9
explicit_merge of '4971f280898b867f9204503887a01d98da03a5fe'
              and '36675cca3be4193a8fa55cfa1dba9a78038b7d92'
   using ancestor ''
        to branch 'org.openembedded.dev'