From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 27 Jun 2008 16:05:50 +0000 (+0000)
Subject: merge of '28c74aa25680384c6f311fd8f4123ddb27c1ba65'
X-Git-Tag: Release-2010-05/1~6599^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=882473c9913cf09da1f8e89738cb859e1e8bd882;p=openembedded.git

Merge ... '28c74aa25680384c6f311fd8f4123ddb27c1ba65'
     and '77f81ea18669b5c79145faa5f0a96df1d7db3232'
---

882473c9913cf09da1f8e89738cb859e1e8bd882