From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 15 Aug 2007 21:13:33 +0000 (+0000)
Subject: merge of 'd1d1db9026fcb0ce740b8c243f2bfc92eeac4c5d'
X-Git-Tag: Release-2010-05/1~8959
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e2b290abea4b8795433fd8753cd15bdea04c10c;p=openembedded.git

Merge ... 'd1d1db9026fcb0ce740b8c243f2bfc92eeac4c5d'
     and 'd969b9d6bcaf1b8db0c0e85d4ce95524a579055b'
---

3e2b290abea4b8795433fd8753cd15bdea04c10c