From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 15 Jun 2007 16:13:21 +0000 (+0000)
Subject: merge of '0af83053cd30ecb7da6ef9c1ff0309caecfe1cbf'
X-Git-Tag: Release-2010-05/1~8868^2~379^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f08a546c28e5fdc9cdf008131400aa87460086f3;p=openembedded.git

Merge ... '0af83053cd30ecb7da6ef9c1ff0309caecfe1cbf'
     and '13d4cd86cb7a8b154e1c94e78f516bb378d335e4'
---

f08a546c28e5fdc9cdf008131400aa87460086f3