From: Felix Domke <tmbinc@elitedvb.ne>
Date: Wed, 6 Jul 2005 12:36:59 +0000 (+0000)
Subject: merge of b3ded1d1eaac41e7a59ad4e07fd2a62bc82b7a19
X-Git-Tag: Release-2010-05/1~9453^2~4227
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6216a03f573582e11be2b240db017a5dfce1b968;p=openembedded.git

merge of b3ded1d1eaac41e7a59ad4e07fd2a62bc82b7a19
     and fa48cd9d3221468ab0ec41034ddca13ed9a726c4
---

6216a03f573582e11be2b240db017a5dfce1b968