From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 19 May 2006 21:08:13 +0000 (+0000)
Subject: merge of 0acfb1eebc2f685a59a9682d0c0ca5f04720f21a
X-Git-Tag: Release-2010-05/1~9453^2~1674
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f192ae2bcc6cf2161071c9b31450feb715f7f2e7;p=openembedded.git

merge of 0acfb1eebc2f685a59a9682d0c0ca5f04720f21a
     and 7dfb32275ca87df4dc04d3f00b404e30e92e677a
---

f192ae2bcc6cf2161071c9b31450feb715f7f2e7