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

merge of 287509423a7ccc469c088f6b92bbdfec0edeadee
     and 407eb0296d350c9cc97e2b25538dc773ded42ce9
---

285312fd74ae999433d163dff3e63bb194224571