From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 3 Jan 2006 21:51:32 +0000 (+0000)
Subject: explicit_merge of '4971f280898b867f9204503887a01d98da03a5fe'
X-Git-Tag: Release-2010-05/1~9453^2~2773^2^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d542955fe0d78730e280e586a03daffd3c1d527;p=openembedded.git

explicit_merge of '4971f280898b867f9204503887a01d98da03a5fe'
              and '36675cca3be4193a8fa55cfa1dba9a78038b7d92'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

7d542955fe0d78730e280e586a03daffd3c1d527