From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 22 Mar 2007 18:01:19 +0000 (+0000)
Subject: merge of '30ed2981d1b51e1b7515fb7bad6e1447ce6ab4e5'
X-Git-Tag: Release-2010-05/1~8868^2~1034
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2cf68047b3775511c137b6c01545ca82ebcf714;p=openembedded.git

Merge ... '30ed2981d1b51e1b7515fb7bad6e1447ce6ab4e5'
     and 'bbd309bb8f001be39eda61e970699d345467347c'
---

b2cf68047b3775511c137b6c01545ca82ebcf714