From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 16 Jan 2008 12:52:08 +0000 (+0000)
Subject: merge of '0460728e4ca997f4b4f35b944f412c51046ff418'
X-Git-Tag: Release-2010-05/1~7894^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f2de5bdbeca3c9d72d1c7cb238b69690798b42c;p=openembedded.git

Merge ... '0460728e4ca997f4b4f35b944f412c51046ff418'
     and '1b0acc215822890043b4d815ac222a6c2e77a15b'
---

3f2de5bdbeca3c9d72d1c7cb238b69690798b42c