From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 26 Mar 2008 10:03:48 +0000 (+0000)
Subject: merge of '6fb81274c29757880096f072fe570dfb0c670634'
X-Git-Tag: Release-2010-05/1~7266^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ba1b284a1d780c7c2948cb994e53d607d124611;p=openembedded.git

Merge ... '6fb81274c29757880096f072fe570dfb0c670634'
     and '98e87503fb19f28515c87f377b4b0723e00bc635'
---

0ba1b284a1d780c7c2948cb994e53d607d124611