From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Sun, 4 May 2008 18:35:42 +0000 (+0000)
Subject: merge of '56948314f3a66d76e956852342e56aa3503b0c1d'
X-Git-Tag: Release-2010-05/1~7026^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5eaf35f60737930c3c22fb3776d233e179d05a1;p=openembedded.git

Merge ... '56948314f3a66d76e956852342e56aa3503b0c1d'
     and '5c2296b573461f137ca8fbc5fc75fd1c254615af'
---

f5eaf35f60737930c3c22fb3776d233e179d05a1