From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 24 Mar 2006 11:25:46 +0000 (+0000)
Subject: merge of 879120a741aec05639064e380f443dc99cf4ad9d
X-Git-Tag: Release-2010-05/1~9453^2~2122
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78c672fe882557a70b5a132353bd036223bc5be5;p=openembedded.git

merge of 879120a741aec05639064e380f443dc99cf4ad9d
     and dc67cfbdff715876fef8d430aad9f1b1b57abb78
---

78c672fe882557a70b5a132353bd036223bc5be5