From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Fri, 5 Aug 2005 01:10:30 +0000 (+0000)
Subject: merge of 22665530c2919ac7f1d5892e662bb25164a13935
X-Git-Tag: Release-2010-05/1~9453^2~3992
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0fe8c3fc05544e64a8b13f1a6c9d0afb2b0a0ff;p=openembedded.git

merge of 22665530c2919ac7f1d5892e662bb25164a13935
     and d30471d59dea9ad55b02e7745e9e96ee40c87846
---

b0fe8c3fc05544e64a8b13f1a6c9d0afb2b0a0ff