From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 13 Feb 2008 11:21:17 +0000 (+0000)
Subject: merge of '90c9a3c552c3bc731dad4d54e5e92acc8d37eb6d'
X-Git-Tag: Release-2010-05/1~7686^2~3^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebd8ca1a732bb964f503b170acb87c0a043651c3;p=openembedded.git

Merge ... '90c9a3c552c3bc731dad4d54e5e92acc8d37eb6d'
     and 'f3ae86a7e3727c818dc1f9d62c2fe35ab49f951c'
---

ebd8ca1a732bb964f503b170acb87c0a043651c3