explicit_merge of 'd8cdf62120af403fb6e212a637f07ee6bec94b05'
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 3 Jan 2006 23:37:06 +0000 (23:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jan 2006 23:37:06 +0000 (23:37 +0000)
commit07e1fc5185995fe409ecc8bf0f1ec1d30ae71bcc
tree903478bd1224b6036e8749e93da401ef2a9cd84a
parentd6e807b8fe873f37bf4b77d2c7fcfbf3ad2cd1d7
parent91f725a1cd51b6dd08b6cd4deb0d71ea19bc16d4
explicit_merge of 'd8cdf62120af403fb6e212a637f07ee6bec94b05'
              and '11923cb95e906cb69ddced31b2fe3e5a10ab53b0'
   using ancestor ''
        to branch 'org.openembedded.dev'