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)
              and '5f32961e5d0f4132f4513cbeac7fe59dc5ae5315'
   using ancestor ''
        to branch 'org.openembedded.dev'


Trivial merge