From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Mon, 14 Aug 2006 20:41:35 +0000 (+0000)
Subject: merge of 4052297c94828dc52bc0def5a0e710c9ac0d5446
X-Git-Tag: Release-2010-05/1~9453^2~957^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b6f55ddfa8c20cc16669d04fb30d020e71d4273;p=openembedded.git

merge of 4052297c94828dc52bc0def5a0e710c9ac0d5446
     and 5e78d5593b39480d9f6ba5bbfc3b6073e7aa3232
---

3b6f55ddfa8c20cc16669d04fb30d020e71d4273