From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 9 Jan 2006 19:19:08 +0000 (+0000)
Subject: explicit_merge of '85da89c673cc2faec29d5ea692e6e7638f4c1b5e'
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45e1048fb2a2fc047c8a903966ca5cc9d1e03112;p=openembedded.git

explicit_merge of '85da89c673cc2faec29d5ea692e6e7638f4c1b5e'
              and '5f32961e5d0f4132f4513cbeac7fe59dc5ae5315'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

45e1048fb2a2fc047c8a903966ca5cc9d1e03112