explicit_merge of '662a617882f791ea9f9ca8aa0bd50f264d6c1db7'
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 3 Jan 2006 21:53:17 +0000 (21:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jan 2006 21:53:17 +0000 (21:53 +0000)
commit64874973f87d493c6376c60d461c5dc4d8f68400
tree85ea8bc5962843a0b7418028affd21d66db8a292
parent7d542955fe0d78730e280e586a03daffd3c1d527
parentde44fa141e4d115141e0fff00e4304d9bb9faf9e
explicit_merge of '662a617882f791ea9f9ca8aa0bd50f264d6c1db7'
              and '00f00d3a48aefe68a725e5e07c63fd5910f1b995'
   using ancestor ''
        to branch 'org.openembedded.dev'