From: John Bowler <jbowler@nslu2-linux.org>
Date: Fri, 20 Jan 2006 19:33:24 +0000 (+0000)
Subject: merge of 595aea330d5742253d5d1cca25ea86a0c2814685
X-Git-Tag: Release-2010-05/1~9453^2~2613
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=364dd693a0d3ccea4a215ea38bfe20587a330c39;p=openembedded.git

merge of 595aea330d5742253d5d1cca25ea86a0c2814685
     and 82bcdbbeb00c95318d566c7433ccdc8ac512737e
---

364dd693a0d3ccea4a215ea38bfe20587a330c39