From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 21 May 2006 16:14:24 +0000 (+0000)
Subject: merge of 60c043fd54516cb786cb22ad9d4e45c007dd7386
X-Git-Tag: Release-2010-05/1~9453^2~1657
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=600044a2b11ab53bdf73e7e33cf193fea91a35ad;p=openembedded.git

merge of 60c043fd54516cb786cb22ad9d4e45c007dd7386
     and 741ca0595f53aa1061d415c78f7788109ca59183
---

600044a2b11ab53bdf73e7e33cf193fea91a35ad