From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Thu, 25 Aug 2005 14:39:57 +0000 (+0000)
Subject: merge of 70cb6f558d4561f1b9c50237e88fa887ccbdf228
X-Git-Tag: Release-2010-05/1~9453^2~3779^2~20^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8ff7b0afbcf476ec3139ae8fd88c79aa3b2c345;p=openembedded.git

merge of 70cb6f558d4561f1b9c50237e88fa887ccbdf228
     and b9177812c9369ebf75a9b853a8e9ed3176223f09
---

a8ff7b0afbcf476ec3139ae8fd88c79aa3b2c345