From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 27 Jun 2008 18:41:46 +0000 (+0000)
Subject: merge of '31de530bc2ccfc10a0020cfb5eab126481380149'
X-Git-Tag: Release-2010-05/1~6599
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf0aac3ac342d1a1614ee7d76a96c13418635b00;p=openembedded.git

Merge ... '31de530bc2ccfc10a0020cfb5eab126481380149'
     and 'b972704167f6ef738f541485ce27cba47e88e225'
---

cf0aac3ac342d1a1614ee7d76a96c13418635b00