From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 28 Aug 2007 15:57:07 +0000 (+0000)
Subject: merge of '266f6beb86630b70cfa55df7d2b557a677d187b0'
X-Git-Tag: Release-2010-05/1~8789
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f39547272713578e2bfaae3ec47d073b48a31563;p=openembedded.git

Merge ... '266f6beb86630b70cfa55df7d2b557a677d187b0'
     and '893542e48954804c96a716027237dc29c119d78b'
---

f39547272713578e2bfaae3ec47d073b48a31563