From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Thu, 14 Jul 2005 12:15:37 +0000 (+0000)
Subject: merge of 479eca038e6fb0b43a93c7dd3ab6d82a6c8bd9b0
X-Git-Tag: Release-2010-05/1~9453^2~4171
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7008f8b4d6dd3a91eda4bc7389e565789b1c5da;p=openembedded.git

merge of 479eca038e6fb0b43a93c7dd3ab6d82a6c8bd9b0
     and ed9017c6685eaffb061f6dc1775021dcf7c6f96d
---

f7008f8b4d6dd3a91eda4bc7389e565789b1c5da