explicit_merge of '2ca40160bd8dc53bfb886ca5453a2b26f9e2d358'
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 3 Jan 2006 21:54:44 +0000 (21:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jan 2006 21:54:44 +0000 (21:54 +0000)
commitd34dcad36f230f617dd4f6a784adef4fd54c827c
treeeaaf80395084a2593a6942bfabc0c30f7716d384
parentaf0ebdb116123591b9ae1a94da28116a9ea4512e
parent64874973f87d493c6376c60d461c5dc4d8f68400
explicit_merge of '2ca40160bd8dc53bfb886ca5453a2b26f9e2d358'
              and 'f0ed2703d9e7b7eeb29d9af8f8d842cef8e8a97a'
   using ancestor ''
        to branch 'org.openembedded.dev'