From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 9 Feb 2008 11:57:37 +0000 (+0000)
Subject: merge of '2233080e8bdaa3d4a3eb8a016e6bb014d7c38e45'
X-Git-Tag: Release-2010-05/1~7711^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1a5094106821b2d9f0f9140939e3848d9b2a777;p=openembedded.git

Merge ... '2233080e8bdaa3d4a3eb8a016e6bb014d7c38e45'
     and '95c3495ce460c2f8f04e1188464c72bde51ce0c9'
---

b1a5094106821b2d9f0f9140939e3848d9b2a777