From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 1 Jul 2005 16:26:41 +0000 (+0000)
Subject: merge of 40ab23b1b8e8e478cc075a3795e981566f038498
X-Git-Tag: Release-2010-05/1~9453^2~4272
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be21c733c40b35efaddd8f3661631130977a18c2;p=openembedded.git

merge of 40ab23b1b8e8e478cc075a3795e981566f038498
     and 9c553d474bbf69d1431bf54db66c846273c33008
---

be21c733c40b35efaddd8f3661631130977a18c2