From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 11 Aug 2006 17:41:05 +0000 (+0000)
Subject: merge of 8025b1031a3e4a5ddd61c6a7a3f4788138fa0264
X-Git-Tag: Release-2010-05/1~9453^2~974
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=793088bf35cab68f4ad12a700f596359505d0ea5;p=openembedded.git

merge of 8025b1031a3e4a5ddd61c6a7a3f4788138fa0264
     and fa44dacbf0a1b7a188ab4126d217aafc5a1f48f8
---

793088bf35cab68f4ad12a700f596359505d0ea5