From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 3 May 2008 19:09:09 +0000 (+0000)
Subject: merge of '217ef203f57a8879dda7852f93f5619e436ee0d0'
X-Git-Tag: Release-2010-05/1~7038
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f0a1dfa7bc08742a457100062f2300fdc6c97b1;p=openembedded.git

Merge ... '217ef203f57a8879dda7852f93f5619e436ee0d0'
     and '6480750745f57330fa2e1d460a167e9bfac73bae'
---

2f0a1dfa7bc08742a457100062f2300fdc6c97b1