From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 4 Apr 2006 22:18:34 +0000 (+0000)
Subject: merge of 0185cf2d013d2c0935d8f930c1bd794ff7d2defe
X-Git-Tag: Release-2010-05/1~9453^2~2096
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a5b841e19e837dac070efe79fcd17f859c797c;p=openembedded.git

merge of 0185cf2d013d2c0935d8f930c1bd794ff7d2defe
     and ab41e679a9bfc6bc2294e34b63fd70a9ef105ead
---

f4a5b841e19e837dac070efe79fcd17f859c797c