From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 30 Jul 2007 11:15:39 +0000 (+0000)
Subject: merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'
X-Git-Tag: Release-2010-05/1~8868^2~78
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=929f61d2aef5cf85e6d88cdbcf542c838a03bf34;p=openembedded.git

Merge ... '4a597627acd6eec179bb1a03405d92cf8b871ac0'
     and '6c89e16689bde0d5bff8b0e47eea04a458190a56'
---

929f61d2aef5cf85e6d88cdbcf542c838a03bf34