From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 20 Aug 2005 15:00:43 +0000 (+0000)
Subject: merge of 627144113ec3248e0a1cd33b66352d01bde87866
X-Git-Tag: Release-2010-05/1~9453^2~3867^2~1^2~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcfe3eb461ab5405aa49bdcd5dc2b5b40110d8d7;p=openembedded.git

merge of 627144113ec3248e0a1cd33b66352d01bde87866
     and e951982319017716291e547c31cf1a75b2ccd676
---

dcfe3eb461ab5405aa49bdcd5dc2b5b40110d8d7