From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 8 Mar 2008 15:47:35 +0000 (+0000)
Subject: merge of 'ad5346155c810928977e1056761f7e6de5142de2'
X-Git-Tag: Release-2010-05/1~7516^2~2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db2c6550228f43ec0c3e1f816355abe4c2d491e;p=openembedded.git

Merge ... 'ad5346155c810928977e1056761f7e6de5142de2'
     and 'feafcb12f6ebb596d3500f718255df081a8c8f5a'
---

0db2c6550228f43ec0c3e1f816355abe4c2d491e