From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 23 Aug 2005 14:01:26 +0000 (+0000)
Subject: merge of 20c7d3251426d253ce0e8b7ebec39f2cc970ed18
X-Git-Tag: Release-2010-05/1~9453^2~3842
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba4a14bbfb3f4e774cf491247c963fcbb116b583;p=openembedded.git

merge of 20c7d3251426d253ce0e8b7ebec39f2cc970ed18
     and ddc841bc5413de481ba5f7392575bba7a9ef04a7
---

ba4a14bbfb3f4e774cf491247c963fcbb116b583