From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 16 Feb 2008 19:54:00 +0000 (+0000)
Subject: merge of '0bbc4414a3d984fe899446fe3d8f50b9238cc3dc'
X-Git-Tag: Release-2010-05/1~7668
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65f11a6585828a99357b8aa0edc50855998390b4;p=openembedded.git

Merge ... '0bbc4414a3d984fe899446fe3d8f50b9238cc3dc'
     and '98f85bb96baab42bb0d213a35c2cd9f1c06a3f47'
---

65f11a6585828a99357b8aa0edc50855998390b4