From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 30 May 2006 12:56:21 +0000 (+0000)
Subject: merge of 3326cffb0ca8c0f56ab7a6d5a6463619e0c7f74c
X-Git-Tag: Release-2010-05/1~9453^2~1560
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f24cb935d1a18bc5b5215934f659d3be6f69049;p=openembedded.git

merge of 3326cffb0ca8c0f56ab7a6d5a6463619e0c7f74c
     and 7ee491539303aba051eb53badf6dc2cf39797dfe
---

4f24cb935d1a18bc5b5215934f659d3be6f69049