From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 10 Aug 2005 02:52:58 +0000 (+0000)
Subject: merge of 6f9c7403f1e4f0d922265c7dd8615d5adc725a91
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~20
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d55a8660b010aec1543b4acd7a8b43e6de7ca846;p=openembedded.git

merge of 6f9c7403f1e4f0d922265c7dd8615d5adc725a91
     and fcfbb6c34ad994d45f290872875c8717b5409ecf
---

d55a8660b010aec1543b4acd7a8b43e6de7ca846