From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 19 Jul 2005 15:10:57 +0000 (+0000)
Subject: merge of 71af6d6609e0de2507d7cd21adfb7e2c18454ef4
X-Git-Tag: Release-2010-05/1~9453^2~4124
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9de11cb504b6552a72c135a6d221fd24235884f4;p=openembedded.git

merge of 71af6d6609e0de2507d7cd21adfb7e2c18454ef4
     and fd2bac75affd95bc23ea64c23ecb07ebd31313e8
---

9de11cb504b6552a72c135a6d221fd24235884f4