From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 30 Jul 2008 18:38:48 +0000 (+0000)
Subject: merge of '1d6f127aae1dbce4a91a9955218de3c4f5ea5f7b'
X-Git-Tag: Release-2010-05/1~6423
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cca8232cceedb002d25514df8db2953e3598a9cf;p=openembedded.git

Merge ... '1d6f127aae1dbce4a91a9955218de3c4f5ea5f7b'
     and '9a389e1e5a5eaac66e8c921c1d1196c323a5030c'
---

cca8232cceedb002d25514df8db2953e3598a9cf