From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 9 Feb 2008 12:26:22 +0000 (+0000)
Subject: merge of '6686ff23579d58fcc1cd77385b2f7dab97200433'
X-Git-Tag: Release-2010-05/1~7710
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca31ea0d011898a311a229fffec024a03b63598f;p=openembedded.git

Merge ... '6686ff23579d58fcc1cd77385b2f7dab97200433'
     and 'a4d4654dbba442a770bc9686a79cb078180ead5b'
---

ca31ea0d011898a311a229fffec024a03b63598f