From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 13 Sep 2005 13:37:19 +0000 (+0000)
Subject: merge of 4c6d0f0d1bdf70c5a10f201ed5bdc2fc9f01c0a8
X-Git-Tag: Release-2010-05/1~9453^2~3525^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=832cb542c12dad5e3ae330a62ec5a872ac47bc60;p=openembedded.git

merge of 4c6d0f0d1bdf70c5a10f201ed5bdc2fc9f01c0a8
     and 7e21aa6ee0ce154c365acb190ba86fffc0eaca8b
---

832cb542c12dad5e3ae330a62ec5a872ac47bc60