From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 28 Jun 2006 15:11:34 +0000 (+0000)
Subject: merge of 0c68cd9f7176bca16daf6bc374bbe0adcb6f7736
X-Git-Tag: Release-2010-05/1~9453^2~1409^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8c3fadf79c2e3d84dcff874719984ea6f3a4450;p=openembedded.git

merge of 0c68cd9f7176bca16daf6bc374bbe0adcb6f7736
     and 9e7bb196edb79eecad7d7ed9e5be82a0489356f6
---

f8c3fadf79c2e3d84dcff874719984ea6f3a4450