From: Robert Schuster <thebohemian@gmx.net>
Date: Fri, 25 Apr 2008 01:40:56 +0000 (+0000)
Subject: merge of '469055299ae8d4097f672b0415b0cdd646bcc0f4'
X-Git-Tag: Release-2010-05/1~7109^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f452835f53842a6b0663c27c40c4db62e944842e;p=openembedded.git

Merge ... '469055299ae8d4097f672b0415b0cdd646bcc0f4'
     and '6ddfc49d6708e4afef01128cf539050c278991e3'
---

f452835f53842a6b0663c27c40c4db62e944842e