From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Fri, 4 Aug 2006 14:05:12 +0000 (+0000)
Subject: merge of 1fabadea24c36f83b75bb8e13e7fe5bd38d9a6ce
X-Git-Tag: Release-2010-05/1~9453^2~999^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20ae0d825ebffc7c3dc5d363bc5ada2531459b27;p=openembedded.git

merge of 1fabadea24c36f83b75bb8e13e7fe5bd38d9a6ce
     and 77319aa9afccfb65571a794b80cb4252577c3e23
---

20ae0d825ebffc7c3dc5d363bc5ada2531459b27