From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 21 Feb 2008 13:46:22 +0000 (+0000)
Subject: merge of '0da4c1d1a1201b71b5bf114146f1ce3482bfc846'
X-Git-Tag: Release-2010-05/1~7616^2~7^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd2035c98bd1995adf7c3df1b73e5f308357e3e3;p=openembedded.git

Merge ... '0da4c1d1a1201b71b5bf114146f1ce3482bfc846'
     and '917b1c29f7daf7bfd184979a9b4f90fa0f1f8616'
---

cd2035c98bd1995adf7c3df1b73e5f308357e3e3