From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 4 Jul 2005 09:56:06 +0000 (+0000)
Subject: merge of 07fb1e9771945baaa8babfbb38017e4909856341
X-Git-Tag: Release-2010-05/1~9453^2~4237^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82e31e5347423068bd314c8e8733330322a209a0;p=openembedded.git

merge of 07fb1e9771945baaa8babfbb38017e4909856341
     and 4f2dd7b3c114d43d427b3331ee9d6b3033cd728a
---

82e31e5347423068bd314c8e8733330322a209a0