From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 15 Jan 2008 00:41:33 +0000 (+0000)
Subject: merge of '213c582b00d27a563e968bbcd4a9c276301fc7cc'
X-Git-Tag: Release-2010-05/1~7917
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6fe69cb29fbe5f96d8e9506fe2b580aba5ebcd3;p=openembedded.git

Merge ... '213c582b00d27a563e968bbcd4a9c276301fc7cc'
     and '25cb2cebe575eb9cbee3dab1ae0fa81368eb3bc6'
---

e6fe69cb29fbe5f96d8e9506fe2b580aba5ebcd3