From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 3 Jun 2008 11:38:42 +0000 (+0000)
Subject: merge of '1583a0f25533f1163ba206ab1b093a09bc5f17a1'
X-Git-Tag: Release-2010-05/1~6842^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a3684452649316724b41f4c8ecc4c35175739ee;p=openembedded.git

Merge ... '1583a0f25533f1163ba206ab1b093a09bc5f17a1'
     and '6c9b3832ef2260eb1b3a74e74b1d73166ab79d89'
---

5a3684452649316724b41f4c8ecc4c35175739ee