From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 11 Jun 2006 09:33:21 +0000 (+0000)
Subject: merge of 4370ca2e204ad443d596f20685d97fe2caf98d16
X-Git-Tag: Release-2010-05/1~9453^2~1463^2~1^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f83e494a6e96dbfb04f4bece2c19be3c455cad72;p=openembedded.git

merge of 4370ca2e204ad443d596f20685d97fe2caf98d16
     and be41d3c873f735d9ffdf407fd302ced522ee9e36
---

f83e494a6e96dbfb04f4bece2c19be3c455cad72