From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 23 Dec 2007 16:19:59 +0000 (+0000)
Subject: merge of '0ad3682d1538e6c932e6fb254eaeac8447d18359'
X-Git-Tag: Release-2010-05/1~8115^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ff1daf1f92bffd5d36e79229c8974efc057802;p=openembedded.git

Merge ... '0ad3682d1538e6c932e6fb254eaeac8447d18359'
     and 'd750bdb7f64441d5df5e00b2b42098fbf3550215'
---

08ff1daf1f92bffd5d36e79229c8974efc057802