From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 30 Aug 2005 21:12:08 +0000 (+0000)
Subject: merge of 7241b1d9470fba9a059677122babf829bc53e3d6
X-Git-Tag: Release-2010-05/1~9453^2~3739
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25a5fe03d4a8eabdf41ac0489659da3ac2909fbd;p=openembedded.git

merge of 7241b1d9470fba9a059677122babf829bc53e3d6
     and 8fc2532eab5aa18bfb78e2d7db01f371bf7f1383
---

25a5fe03d4a8eabdf41ac0489659da3ac2909fbd