From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 29 Jun 2008 12:17:17 +0000 (+0000)
Subject: merge of '2c5d0d8be360397528c4d116b6cbfb655cba6778'
X-Git-Tag: Release-2010-05/1~6589
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b412621bc4526a63fd6648dd5e81fa09b19bf3b;p=openembedded.git

Merge ... '2c5d0d8be360397528c4d116b6cbfb655cba6778'
     and '7c12c95bf9c72db33fe18c1e84311fba909db68b'
---

1b412621bc4526a63fd6648dd5e81fa09b19bf3b