From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Aug 2008 17:40:05 +0000 (+0000)
Subject: merge of 'c05229a8c5246cada336c3cfe5a3417367366836'
X-Git-Tag: Release-2010-05/1~6317
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6760f8efc93922a44d225129143387c37d760f1b;p=openembedded.git

Merge ... 'c05229a8c5246cada336c3cfe5a3417367366836'
     and 'ef9cb35b2ec71124443e3492f55fe842c40ba66e'
---

6760f8efc93922a44d225129143387c37d760f1b