From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 24 Jan 2006 19:48:31 +0000 (+0000)
Subject: merge of 09f9e22a8b02fd6a41aa1d5a558f5ba97103e99a
X-Git-Tag: Release-2010-05/1~9453^2~2562^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6659135578e8466727b9125de47a7a0e34c8b05;p=openembedded.git

merge of 09f9e22a8b02fd6a41aa1d5a558f5ba97103e99a
     and fde5d898c22b8382518f54905b699a11addbc8a3
---

c6659135578e8466727b9125de47a7a0e34c8b05