explicit_merge of '911d39563f4bbb32b27acb504168de96ff1e68f7'
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 06:36:28 +0000 (06:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 06:36:28 +0000 (06:36 +0000)
commitdc20efdac5955750b579ad16e2515f63ab8d0f8e
treebe91eada316b9abe6b1a95bb5ac938ed4f8c0e2c
parent19f3fb04fe976bf96329356ea2209e92e8827a21
parent58d8ffa2cfd134d912985cb9fe41727b74461ab0
explicit_merge of '911d39563f4bbb32b27acb504168de96ff1e68f7'
              and 'd17c8965045bca1d838e85c0b4579217b647682c'
   using ancestor ''
        to branch 'org.openembedded.dev'