From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 30 Jul 2005 20:03:56 +0000 (+0000)
Subject: merge of 3c9f4ce15100759b2690593146500292e2ebce4f
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~21
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82eca06c34e4483962439a7e363e1c299cc1c59e;p=openembedded.git

merge of 3c9f4ce15100759b2690593146500292e2ebce4f
     and c59a2ecfda2f1be87d5b4492b21cd68682012044
---

82eca06c34e4483962439a7e363e1c299cc1c59e