From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 8 Apr 2008 12:07:38 +0000 (+0000)
Subject: merge of '3d05aaf0d53086b42c0aeaa306814e38a106fa9a'
X-Git-Tag: Release-2010-05/1~7220^2~8^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f77305366a560bd673633ee926ab20bfb3eceb91;p=openembedded.git

Merge ... '3d05aaf0d53086b42c0aeaa306814e38a106fa9a'
     and '457fd6fde63edf614faf98c2e44cbb46c7703a88'
---

f77305366a560bd673633ee926ab20bfb3eceb91