From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 16 May 2006 17:50:37 +0000 (+0000)
Subject: merge of 5b0f4b84adef041cf78ecdf5c1a735acd5deac13
X-Git-Tag: Release-2010-05/1~9453^2~1692^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c2b5baf59bebd0e5d198cbd0baa50be274e1fce;p=openembedded.git

merge of 5b0f4b84adef041cf78ecdf5c1a735acd5deac13
     and 967ebf04581082d47dec89329e39eacdd1c6a0f7
---

5c2b5baf59bebd0e5d198cbd0baa50be274e1fce