From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 25 May 2006 21:32:15 +0000 (+0000)
Subject: merge of 2d6d863c36fd1d9d7ab0dba3d700e0f1ccf122be
X-Git-Tag: Release-2010-05/1~9453^2~1620
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=321981ba96a07994437a2888598519b61fb4fc39;p=openembedded.git

merge of 2d6d863c36fd1d9d7ab0dba3d700e0f1ccf122be
     and 5429025616a252862aead1378c8075987190a85a
---

321981ba96a07994437a2888598519b61fb4fc39