From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 10 Aug 2007 11:01:07 +0000 (+0000)
Subject: merge of '294a7914d9ff32527dddf5266da757d7385372e7'
X-Git-Tag: Release-2010-05/1~9054^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=218897f352d0bed08178a177d186f59c8c73a506;p=openembedded.git

Merge ... '294a7914d9ff32527dddf5266da757d7385372e7'
     and '726f50fa46c4db4bf5fb2dc2f6390ca60337cdd0'
---

218897f352d0bed08178a177d186f59c8c73a506