From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 7 Aug 2005 19:52:14 +0000 (+0000)
Subject: merge of bb045a5a17fc33253d0065173055ac1656458613
X-Git-Tag: Release-2010-05/1~9453^2~3954^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba6f7d73b8aed12409a8229c56fda66914f0b499;p=openembedded.git

merge of bb045a5a17fc33253d0065173055ac1656458613
     and bbc23020a7627395141c2b93697ae9ccd1ea4a08
---

ba6f7d73b8aed12409a8229c56fda66914f0b499