From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 3 Apr 2007 22:28:24 +0000 (+0000)
Subject: merge of '59df690e4022993ebd05954ef260ae9362300ac1'
X-Git-Tag: Release-2010-05/1~8868^2~813^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f4d2026901746ce13a60cf6257f98d626ee3e9e;p=openembedded.git

Merge ... '59df690e4022993ebd05954ef260ae9362300ac1'
     and 'cea642eee26bd3cdd008cf21f1e1aad4ecfd69e6'
---

8f4d2026901746ce13a60cf6257f98d626ee3e9e