From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 9 Aug 2005 21:29:17 +0000 (+0000)
Subject: merge of a76f350b51bedef01b414ca428726bc656900e86
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~30
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d23f63a1b479a5a90f9f18add690807d2a5a96b;p=openembedded.git

merge of a76f350b51bedef01b414ca428726bc656900e86
     and f1d9c506311c18e24649910f85d49714dadc9e98
---

8d23f63a1b479a5a90f9f18add690807d2a5a96b