From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 15 Mar 2007 15:18:06 +0000 (+0000)
Subject: merge of 'a1f690feff27a3cf8c220262f43412c6cefd8638'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~8^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10c51fbb2fe9394445c658541db485fd5a83e7c1;p=openembedded.git

Merge ... 'a1f690feff27a3cf8c220262f43412c6cefd8638'
     and 'e7fbe6e21edb50535d695aa0668f424883d1c7a3'
---

10c51fbb2fe9394445c658541db485fd5a83e7c1