From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 20 Aug 2007 12:08:05 +0000 (+0000)
Subject: merge of 'a11f318a90beef34d84711b348b891eddfabc2bf'
X-Git-Tag: Release-2010-05/1~8883^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97cdde9f9344eaeb369b3f3cb4dce4ec0254b5e6;p=openembedded.git

Merge ... 'a11f318a90beef34d84711b348b891eddfabc2bf'
     and 'a4b1e7b65833194a48909d836e87a913dbbe3c66'
---

97cdde9f9344eaeb369b3f3cb4dce4ec0254b5e6