From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 15 Aug 2007 12:33:13 +0000 (+0000)
Subject: merge of '2a03e34bdcc2e0c0f1a0fc21e23f3410bf721570'
X-Git-Tag: Release-2010-05/1~8961^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1312083bf2c572132431ffa6309a28b1e1b29de;p=openembedded.git

Merge ... '2a03e34bdcc2e0c0f1a0fc21e23f3410bf721570'
     and 'c7f491129542b0c8e72a670a0ce2395920494179'
---

f1312083bf2c572132431ffa6309a28b1e1b29de