From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 5 Dec 2007 17:58:05 +0000 (+0000)
Subject: merge of '4273804b598541555abb070bcb83ec503beaceff'
X-Git-Tag: Release-2010-05/1~8213
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b65b7aa8f9d5462f9ef95e20e7be1f4dce4ee0d;p=openembedded.git

Merge ... '4273804b598541555abb070bcb83ec503beaceff'
     and '99925725722e255ce214c4cfb61018cbf2729439'
---

0b65b7aa8f9d5462f9ef95e20e7be1f4dce4ee0d