explicit_merge of 'ff8f93bf075f5225452de6de0f7feb3aa1174889'
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 3 Jan 2006 21:57:01 +0000 (21:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jan 2006 21:57:01 +0000 (21:57 +0000)
commit91f725a1cd51b6dd08b6cd4deb0d71ea19bc16d4
tree903478bd1224b6036e8749e93da401ef2a9cd84a
parentcf6a9b059d567d022435b0077fc1ba73e4955fe4
parent14e90875fff476f1c8487d781e44c8d9f83179d5
explicit_merge of 'ff8f93bf075f5225452de6de0f7feb3aa1174889'
              and 'c47b56a3ef9d7d425411c60ff6fef2a174b20ea6'
   using ancestor ''
        to branch 'org.openembedded.dev'