From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 3 Oct 2005 22:09:41 +0000 (+0000)
Subject: merge of 2786b01c941e932325ebd3fc61a3a60664dc3b48
X-Git-Tag: Release-2010-05/1~9453^2~3380
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06c5c42e2da68e95c6cdf39606150865e36b1f71;p=openembedded.git

merge of 2786b01c941e932325ebd3fc61a3a60664dc3b48
     and 29da97548b6f79e801e68f41b3a37862a7577bfa
---

06c5c42e2da68e95c6cdf39606150865e36b1f71