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

explicit_merge of 'ff8f93bf075f5225452de6de0f7feb3aa1174889'
              and 'c47b56a3ef9d7d425411c60ff6fef2a174b20ea6'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

91f725a1cd51b6dd08b6cd4deb0d71ea19bc16d4