From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 30 Jul 2008 19:01:20 +0000 (+0000)
Subject: merge of '29d752d6760fe8971e4d37f73f5bad5ed1b0abd7'
X-Git-Tag: Release-2010-05/1~6422
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0538f8803f582c37075ae5e5965098f118a502fe;p=openembedded.git

Merge ... '29d752d6760fe8971e4d37f73f5bad5ed1b0abd7'
     and 'c60a4268168f4df8d07b333ec16af3ae2aed261f'
---

0538f8803f582c37075ae5e5965098f118a502fe