From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Thu, 30 Mar 2006 16:46:10 +0000 (+0000)
Subject: merge of 2fac7157f5cc7d55100976b026dbeea2d41eebcf
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~36^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f4c13aa412fde10108c0484627aa69e6e3d577a;p=openembedded.git

merge of 2fac7157f5cc7d55100976b026dbeea2d41eebcf
     and 73d1a07867a552420dc55bf6b9d96d09b572b670
---

3f4c13aa412fde10108c0484627aa69e6e3d577a