From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 7 Feb 2008 23:32:09 +0000 (+0000)
Subject: merge of '2b4e1c7a35c118cf363c771f015c4fdfa5f84731'
X-Git-Tag: Release-2010-05/1~7713^2~15^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba4001fe8c00586b71fb1043795e1b99e3234025;p=openembedded.git

Merge ... '2b4e1c7a35c118cf363c771f015c4fdfa5f84731'
     and '36fe2f5bf87b5a8eedda174012a2e93f8bb5a8f5'
---

ba4001fe8c00586b71fb1043795e1b99e3234025