From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 10 Jul 2008 23:09:50 +0000 (+0000)
Subject: merge of '7131f28196073180061901d8749502f5acea9a0b'
X-Git-Tag: Release-2010-05/1~6546
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=058132b8be45ac2041a574782b8800c1956e44d3;p=openembedded.git

Merge ... '7131f28196073180061901d8749502f5acea9a0b'
     and 'd96c1b4121283c5dad1b8e0b2cafde6526d5b428'
---

058132b8be45ac2041a574782b8800c1956e44d3