From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Mon, 4 Dec 2006 18:42:00 +0000 (+0000)
Subject: merge of 425cf1b391611c169a1c3b78f1fe86df088902b9
X-Git-Tag: Release-2010-05/1~9453^2~204^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76523d3faf9c6d42ba8a2c9a8db44607da16277e;p=openembedded.git

merge of 425cf1b391611c169a1c3b78f1fe86df088902b9
     and 87eec7927f92f34a08ce624f3ff7f4cc85645fd2
---

76523d3faf9c6d42ba8a2c9a8db44607da16277e