From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 12 Aug 2008 23:49:17 +0000 (+0000)
Subject: merge of '3c94d9db3ba91b1d4e037bacbd0bce84e35642eb'
X-Git-Tag: Release-2010-05/1~6333^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7607b318639c6343b6a03cec177cfe24728f0165;p=openembedded.git

Merge ... '3c94d9db3ba91b1d4e037bacbd0bce84e35642eb'
     and 'e50fc707da1372d68e46edaf3a6915bf53f628b9'
---

7607b318639c6343b6a03cec177cfe24728f0165