From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 3 Aug 2008 23:04:56 +0000 (+0000)
Subject: merge of '3d37ffd4df7a43763fa8642112a238989e1e85ae'
X-Git-Tag: Release-2010-05/1~6371
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e0950a0db376b2ffaedbef84866795012c3036d;p=openembedded.git

Merge ... '3d37ffd4df7a43763fa8642112a238989e1e85ae'
     and '5eed113f8f560df1854b52e85453d3987ec071eb'
---

4e0950a0db376b2ffaedbef84866795012c3036d