From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 13 Jan 2008 13:36:18 +0000 (+0000)
Subject: merge of 'c171a0d7bd9dab6cbbf1d894d770fab51475bd07'
X-Git-Tag: Release-2010-05/1~7948
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d78f19cd9f51f7ad51a82e65c98c8465f6f5c876;p=openembedded.git

Merge ... 'c171a0d7bd9dab6cbbf1d894d770fab51475bd07'
     and 'd6039fc8233d21dd9be5522f8986b26912e70b0e'
---

d78f19cd9f51f7ad51a82e65c98c8465f6f5c876