From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 18 Feb 2008 20:07:28 +0000 (+0000)
Subject: merge of '5b06f0eb5e960e760e2621fc769e25d326372fb6'
X-Git-Tag: Release-2010-05/1~7653^2~25^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d892325e298089764eeb56f6202f545a1187a45;p=openembedded.git

Merge ... '5b06f0eb5e960e760e2621fc769e25d326372fb6'
     and '8b854b2b358a134500f7b4e1826c4fab2dc417ed'
---

0d892325e298089764eeb56f6202f545a1187a45