From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Thu, 25 Aug 2005 15:02:33 +0000 (+0000)
Subject: merge of 297319220bbe0dfbc43d63ae1a0cdfed469df8aa
X-Git-Tag: Release-2010-05/1~9453^2~3779^2~20
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f51654318b1181ffe2e6f0cde2ce7334297d119;p=openembedded.git

merge of 297319220bbe0dfbc43d63ae1a0cdfed469df8aa
     and dca4f1b7a000914caf1cdea0ed1b3898acf3e120
---

8f51654318b1181ffe2e6f0cde2ce7334297d119