From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 27 May 2006 18:23:07 +0000 (+0000)
Subject: merge of 56ee470fc65db2cddfbe809ef76746929e1cc7a1
X-Git-Tag: Release-2010-05/1~9453^2~1576^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b97f58bb6a349de1e1aa6013e3370b7a8eda47da;p=openembedded.git

merge of 56ee470fc65db2cddfbe809ef76746929e1cc7a1
     and cd5dfac4524135d71f6f42fb7d1288b700ec5d38
---

b97f58bb6a349de1e1aa6013e3370b7a8eda47da