From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sat, 21 Jan 2006 01:37:55 +0000 (+0000)
Subject: merge of 6ac1a4c52127b4cff0f1697486446d35bc700a93
X-Git-Tag: Release-2010-05/1~9453^2~2605^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b068dbd2142c8aa200dbfb2a1b573e60a3fd1244;p=openembedded.git

merge of 6ac1a4c52127b4cff0f1697486446d35bc700a93
     and 974f590a7b8d1debd7106739e6e644f150d015fc
---

b068dbd2142c8aa200dbfb2a1b573e60a3fd1244