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

explicit_merge of '2ca40160bd8dc53bfb886ca5453a2b26f9e2d358'
              and 'f0ed2703d9e7b7eeb29d9af8f8d842cef8e8a97a'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

d34dcad36f230f617dd4f6a784adef4fd54c827c