From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 5 Apr 2007 14:38:39 +0000 (+0000)
Subject: merge of '053d742c2229e2b07ec4091286904c0972494f3c'
X-Git-Tag: Release-2010-05/1~8868^2~771^2^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1094af5b9af66f5e486e886eae719d95c3c929a8;p=openembedded.git

Merge ... '053d742c2229e2b07ec4091286904c0972494f3c'
     and 'b3af45890d6f25fd694e2af28fd291018aaecd2a'
---

1094af5b9af66f5e486e886eae719d95c3c929a8