From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 5 Feb 2006 01:01:54 +0000 (+0000)
Subject: merge of 253b3416d6485c95aa1653ae4d5b49a707d9fbe6
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1e5ad6c67eaaf22b6223f3f3c2633177d77f4da;p=openembedded.git

merge of 253b3416d6485c95aa1653ae4d5b49a707d9fbe6
     and 9b98e6390444bf96f5e5fa74d89ff83c0083a833
---

a1e5ad6c67eaaf22b6223f3f3c2633177d77f4da