From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Thu, 10 Aug 2006 13:05:05 +0000 (+0000)
Subject: merge of '08e70776677fa0f013e2fdebcb38400d33bbe8d4'
X-Git-Tag: Release-2010-05/1~9453^2~996^2~1^2^2~1^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98740d48a61b323289681cb914793d32e94af8e8;p=openembedded.git

Merge ... '08e70776677fa0f013e2fdebcb38400d33bbe8d4'
     and '539b74462bd94e1453d57157f829d03019f912c8'
---

98740d48a61b323289681cb914793d32e94af8e8