From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 27 Sep 2006 19:49:07 +0000 (+0000)
Subject: merge of 629adcaf78ed27ef81715e0e1b0ba32f4fb9ee20
X-Git-Tag: Release-2010-05/1~9453^2~677^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf572f9d2cc1949a0beeec264726ee1b8ecc44fe;p=openembedded.git

merge of 629adcaf78ed27ef81715e0e1b0ba32f4fb9ee20
     and f1eebc8126f71376848293407e13215310c13e8c
---

cf572f9d2cc1949a0beeec264726ee1b8ecc44fe