From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 30 Nov 2005 16:49:19 +0000 (+0000)
Subject: merge of affb16dd1c262c6f56c38e1ed230478f0aaa91d7
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=277616420978b7c17f2e50d906962802ef79449a;p=openembedded.git

merge of affb16dd1c262c6f56c38e1ed230478f0aaa91d7
     and ebcf7913b985f1954e5315bca0dfc1c50bb2c940
---

277616420978b7c17f2e50d906962802ef79449a