explicit_merge of '09145be36a071f7c39a4d421da54e87a449cecc1'
authorKoen Kooi <koen@openembedded.org>
Thu, 2 Mar 2006 17:43:42 +0000 (17:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Mar 2006 17:43:42 +0000 (17:43 +0000)
commit966f3a94af2c83ffd2c634171fbe04917731b6f9
tree1f3c567f32229a1a50bb00bc57abed97674bbc53
parent3b329bd57865df84d231b645e1e40572196bd211
parent3326b01658a2c98c72e455e53167ba7f252c3209
explicit_merge of '09145be36a071f7c39a4d421da54e87a449cecc1'
              and 'bad62b438dd2c5c176aff6068068f022faa98dbb'
   using ancestor ''
        to branch 'org.openembedded.dev'