From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 11 May 2006 15:07:31 +0000 (+0000)
Subject: merge of cdbb7877ce270a2160669f6ed055cdd98154f548
X-Git-Tag: Release-2010-05/1~9453^2~1723^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2222e629a6bf3ebaafce55cfd533486ec9926887;p=openembedded.git

merge of cdbb7877ce270a2160669f6ed055cdd98154f548
     and cf54ffcd5816180e831bfbb9a1e93abeb12a62e4
---

2222e629a6bf3ebaafce55cfd533486ec9926887