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

explicit_merge of 'd8cdf62120af403fb6e212a637f07ee6bec94b05'
              and '11923cb95e906cb69ddced31b2fe3e5a10ab53b0'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

07e1fc5185995fe409ecc8bf0f1ec1d30ae71bcc