From: John Bowler <jbowler@nslu2-linux.org>
Date: Thu, 11 Aug 2005 20:22:47 +0000 (+0000)
Subject: merge of c05b7d0d68a0aebf878d9b85531b595e425dabaa
X-Git-Tag: Release-2010-05/1~9453^2~3928
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cff3466536b9cbef56882e2a39e5f69022dccdfe;p=openembedded.git

merge of c05b7d0d68a0aebf878d9b85531b595e425dabaa
     and f53fd48079b012f260a4377a58c829aa1b21fe0f
---

cff3466536b9cbef56882e2a39e5f69022dccdfe