From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 7 Mar 2007 12:19:49 +0000 (+0000)
Subject: merge of '2a83a3cf4b622a0ca66d5de38b7d9bbb6be39bb1'
X-Git-Tag: Release-2010-05/1~8868^2~1105^2~33
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58ba2ad5fdd6bd64b9bef0ea5cd1d8b1e3d67346;p=openembedded.git

Merge ... '2a83a3cf4b622a0ca66d5de38b7d9bbb6be39bb1'
     and 'bc33dfddb8c5346507272c2bd3b2bd5bfc97d203'
---

58ba2ad5fdd6bd64b9bef0ea5cd1d8b1e3d67346