From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 29 Aug 2008 09:03:23 +0000 (+0000)
Subject: merge of '3cf7e5f6eed59497a0164a981af89d6bd0f96fae'
X-Git-Tag: Release-2010-05/1~6210
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e49acfb489180f3e9563202194ba633c84b3a4c;p=openembedded.git

Merge ... '3cf7e5f6eed59497a0164a981af89d6bd0f96fae'
     and 'f51fb525f916aeb12bcca0e4627daa0b3888de81'
---

8e49acfb489180f3e9563202194ba633c84b3a4c