From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 18 Jan 2008 14:15:39 +0000 (+0000)
Subject: merge of '2160ef6a1176c4f7a49c5f831509721ea75cd35b'
X-Git-Tag: Release-2010-05/1~7890^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7569440e6587054a298f1417447750a3aff0afd9;p=openembedded.git

Merge ... '2160ef6a1176c4f7a49c5f831509721ea75cd35b'
     and '9a37a94626c4cf51ec6e7f7d6995599fb462f838'
---

7569440e6587054a298f1417447750a3aff0afd9