From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 5 Feb 2006 06:36:28 +0000 (+0000)
Subject: explicit_merge of '911d39563f4bbb32b27acb504168de96ff1e68f7'
X-Git-Tag: Release-2010-05/1~9453^2~2455^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc20efdac5955750b579ad16e2515f63ab8d0f8e;p=openembedded.git

explicit_merge of '911d39563f4bbb32b27acb504168de96ff1e68f7'
              and 'd17c8965045bca1d838e85c0b4579217b647682c'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

dc20efdac5955750b579ad16e2515f63ab8d0f8e