From: Derek Young <dyoung@nslu2-linux.org>
Date: Tue, 30 Aug 2005 18:01:12 +0000 (+0000)
Subject: merge of 1c3f5d84b51552d7b6e9729979f4fd8da7deceb1
X-Git-Tag: Release-2010-05/1~9453^2~3696^2~2^2~1^2^2^2^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d4cad6844d45d814602fb75204f0063056270f9;p=openembedded.git

merge of 1c3f5d84b51552d7b6e9729979f4fd8da7deceb1
     and ce0d2a7a95e1c417c4b1e7e0aa729d1a4c37f6ee
---

2d4cad6844d45d814602fb75204f0063056270f9