From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 3 Sep 2008 15:04:08 +0000 (+0000)
Subject: merge of '23d1f770a092f023ba951e138b787c9bacc3152d'
X-Git-Tag: Release-2010-05/1~6170
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77fe2053f54d554884e65c6e4336f014f7f80fe0;p=openembedded.git

Merge ... '23d1f770a092f023ba951e138b787c9bacc3152d'
     and 'fe28a990b29bbfd099e38e4fe044896bd0a0d68e'
---

77fe2053f54d554884e65c6e4336f014f7f80fe0