From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 5 Apr 2008 22:07:14 +0000 (+0000)
Subject: merge of '2bc71b9b93f22417784c3a4ed3576a76841878f2'
X-Git-Tag: Release-2010-05/1~7249
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf39bb6e3fabae6da5f9b8084f8d478f07e4836c;p=openembedded.git

Merge ... '2bc71b9b93f22417784c3a4ed3576a76841878f2'
     and 'edac95232b05ccd8efaeee530e0442683d1ef50a'
---

bf39bb6e3fabae6da5f9b8084f8d478f07e4836c