From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Tue, 22 Aug 2006 14:26:18 +0000 (+0000)
Subject: merge of 4afeb65d2d724da6938ccfa96b35c1dcbaa40f26
X-Git-Tag: Release-2010-05/1~9453^2~911^2~16^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a4fa9daeffad0a09030b26c2c1bf2b74a7a5065;p=openembedded.git

merge of 4afeb65d2d724da6938ccfa96b35c1dcbaa40f26
     and e6ffd04153758be5656011ba47b7a327af58ec5f
---

7a4fa9daeffad0a09030b26c2c1bf2b74a7a5065