From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 4 Apr 2006 22:19:59 +0000 (+0000)
Subject: merge of 7fa1e5c6dd75c098cabd0b1240a46de4c4a174ab
X-Git-Tag: Release-2010-05/1~9453^2~2095^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c91a636dfb9813b4c65c168bdef7dcc8fcaf768;p=openembedded.git

merge of 7fa1e5c6dd75c098cabd0b1240a46de4c4a174ab
     and ab41e679a9bfc6bc2294e34b63fd70a9ef105ead
---

1c91a636dfb9813b4c65c168bdef7dcc8fcaf768