From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 3 Feb 2008 23:36:10 +0000 (+0000)
Subject: merge of '19595382c19aadeee7dac4939deb285a05e428eb'
X-Git-Tag: Release-2010-05/1~7765^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a0f697a1edde61c30b8606430f1417e6dcc4931;p=openembedded.git

Merge ... '19595382c19aadeee7dac4939deb285a05e428eb'
     and '31ced983465ce39a8b2be69de54096ba17a8b404'
---

1a0f697a1edde61c30b8606430f1417e6dcc4931