From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 29 Mar 2008 16:34:58 +0000 (+0000)
Subject: merge of 'd64ac77a872f13513c87a0d8a234d5025cd4b8ab'
X-Git-Tag: Release-2010-05/1~7251
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d706e2e4274bd37ea95c331fbe1b9a9b275bd3b0;p=openembedded.git

Merge ... 'd64ac77a872f13513c87a0d8a234d5025cd4b8ab'
     and 'f818d337a5b7485dbab518f9a6b6d283edcc4f6b'
---

d706e2e4274bd37ea95c331fbe1b9a9b275bd3b0