From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 3 Aug 2007 14:37:58 +0000 (+0000)
Subject: merge of '4f7ef143d39b81858bfefba3a315d8285fd52634'
X-Git-Tag: Release-2010-05/1~8868^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a481e9856f4622d0dbcb50c064a4c0dd0a9dcfc;p=openembedded.git

Merge ... '4f7ef143d39b81858bfefba3a315d8285fd52634'
     and '7674b4433c1bb9bc4645e63991d9d2fe659d8577'
---

4a481e9856f4622d0dbcb50c064a4c0dd0a9dcfc