From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 22 May 2006 11:00:18 +0000 (+0000)
Subject: merge of 3fe026a130277946b2552c28c3fdda5e9bd74b31
X-Git-Tag: Release-2010-05/1~9453^2~1651
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=087e914265f66c12ecbb64c8132e6e7237d4a3d8;p=openembedded.git

merge of 3fe026a130277946b2552c28c3fdda5e9bd74b31
     and d295f271af118b6b44395ca3e2c23eba55f3fa69
---

087e914265f66c12ecbb64c8132e6e7237d4a3d8