From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 6 Jul 2005 00:29:05 +0000 (+0000)
Subject: merge of 9a11de92d9c3eed4c359dd682b59ad9fa1269059
X-Git-Tag: Release-2010-05/1~9455^2~4207^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ee4b9c71f6a01de7ed32a8ad7018a9c45af6b0a;p=openembedded.git

merge of 9a11de92d9c3eed4c359dd682b59ad9fa1269059
     and c7189342ca7601a9bcc0fc14fb902f0adac7b0f7
---

3ee4b9c71f6a01de7ed32a8ad7018a9c45af6b0a