From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 14 Aug 2005 21:42:36 +0000 (+0000)
Subject: merge of 2e3186680931aa0d42ca8ef7a58d57ab879c666d
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~22^2~3^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd636a9b7dd83528120de4073b3b15b1143a6cfb;p=openembedded.git

merge of 2e3186680931aa0d42ca8ef7a58d57ab879c666d
     and 8cf91caaca9410d5dd62925ca7d54919cc672af0
---

fd636a9b7dd83528120de4073b3b15b1143a6cfb