From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 7 Aug 2005 21:26:22 +0000 (+0000)
Subject: explicit_merge of 85d8528d47a6cf1ff8d3c10b55e327fea4c8262b
X-Git-Tag: Release-2010-05/1~9453^2~3954^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec4cc21941a1a0d791efe69c5c7fcfb0a14b117d;p=openembedded.git

explicit_merge of 85d8528d47a6cf1ff8d3c10b55e327fea4c8262b
              and 3fdd532025257c25f1c852c0042381869d25b9d6
   using ancestor
        to branch 'org.openembedded.nslu2-linux'
---

ec4cc21941a1a0d791efe69c5c7fcfb0a14b117d