From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 2 Aug 2007 16:31:59 +0000 (+0000)
Subject: merge of '3acc599523c89258a0e3bf8dd3a98c692ad3b555'
X-Git-Tag: Release-2010-05/1~8868^2~40
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77d305c7a6711702339ef48040b4206dc63ea927;p=openembedded.git

Merge ... '3acc599523c89258a0e3bf8dd3a98c692ad3b555'
     and 'f1003174f8c7f99c993d4a46fe0221bdbf197e7d'
---

77d305c7a6711702339ef48040b4206dc63ea927