From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 5 Feb 2006 05:26:43 +0000 (+0000)
Subject: merge of 911d39563f4bbb32b27acb504168de96ff1e68f7
X-Git-Tag: Release-2010-05/1~9453^2~2458
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aea7a790f3a96a488c6197cacb26707fbbda16a4;p=openembedded.git

merge of 911d39563f4bbb32b27acb504168de96ff1e68f7
     and c6e9501260c1bb7c2842f36ce47f70045a964179
---

aea7a790f3a96a488c6197cacb26707fbbda16a4