From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 5 Jul 2006 01:57:53 +0000 (+0000)
Subject: merge of ab0d2fe564011d47e659f0272adc979bf2b14851
X-Git-Tag: Release-2010-05/1~9453^2~1345^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=462bc020690758653b58f06150137b8cfce03063;p=openembedded.git

merge of ab0d2fe564011d47e659f0272adc979bf2b14851
     and b4cecac313920e874d5627f1f3621c1fede4bf12
---

462bc020690758653b58f06150137b8cfce03063