From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 21 Mar 2008 23:54:15 +0000 (+0000)
Subject: merge of '048900e1dc1296a50f90bf6b77b7be816922e4ac'
X-Git-Tag: Release-2010-05/1~7299
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98cbb1de7c19b9822b091cd6f675950bdbb0ecea;p=openembedded.git

Merge ... '048900e1dc1296a50f90bf6b77b7be816922e4ac'
     and '8f046513c054e5ae4400145d7f5e0288953f7fab'
---

98cbb1de7c19b9822b091cd6f675950bdbb0ecea