From: Robert Schuster <thebohemian@gmx.net>
Date: Thu, 31 Jul 2008 23:37:16 +0000 (+0000)
Subject: merge of '42cb81c40550397bea69b71bcc8768f0b8b81476'
X-Git-Tag: Release-2010-05/1~6414^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f8e3f99fa335bd4ee9ecaa8823b7dc0f299c9b9;p=openembedded.git

Merge ... '42cb81c40550397bea69b71bcc8768f0b8b81476'
     and '8cb0572b0f44ef514300735efee6e6721ef539f1'
---

9f8e3f99fa335bd4ee9ecaa8823b7dc0f299c9b9