From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 11 Mar 2007 20:49:50 +0000 (+0000)
Subject: merge of '3d16fc990b4d6c80f2bcc61c2c91f1e48be35123'
X-Git-Tag: Release-2010-05/1~8868^2~1104
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8b24b6f7f786d8e21711e1e4a32d110d8015827;p=openembedded.git

Merge ... '3d16fc990b4d6c80f2bcc61c2c91f1e48be35123'
     and '794c9bc6688e14db2005eb3dd1743fc853634339'
---

d8b24b6f7f786d8e21711e1e4a32d110d8015827