explicit_merge of '85da89c673cc2faec29d5ea692e6e7638f4c1b5e'
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 9 Jan 2006 19:19:08 +0000 (19:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 9 Jan 2006 19:19:08 +0000 (19:19 +0000)
commit45e1048fb2a2fc047c8a903966ca5cc9d1e03112
tree6f5c507ceb9741a5598d2531b980c2f6d7ddf7f0
parentedbb148535f63e58a8e10ed5c68b7aecb983602e
parentce0af9851e5a2231b9ed9fcfecfd10cc4b7794c3
explicit_merge of '85da89c673cc2faec29d5ea692e6e7638f4c1b5e'
              and '5f32961e5d0f4132f4513cbeac7fe59dc5ae5315'
   using ancestor ''
        to branch 'org.openembedded.dev'