From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 12 Feb 2006 06:14:45 +0000 (+0000)
Subject: merge of 4a7910f6f324ae55c1f42b4a22cbea6651e48ced
X-Git-Tag: Release-2010-05/1~9453^2~2371^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35068fe2dedb39507b515eecb3039d38daffb789;p=openembedded.git

merge of 4a7910f6f324ae55c1f42b4a22cbea6651e48ced
     and 8ea0fe4b0de92b762636231b067ef6a7f6137d01
---

35068fe2dedb39507b515eecb3039d38daffb789