From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 12 Aug 2008 13:29:28 +0000 (+0000)
Subject: merge of 'da96891a2ca8b58603eeace03f70b31bdb83f534'
X-Git-Tag: Release-2010-05/1~6333^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5013da3eac1b9eaa3e459e51868c972f35d13987;p=openembedded.git

Merge ... 'da96891a2ca8b58603eeace03f70b31bdb83f534'
     and 'ff29d35506adb74555e6297276dcbf0d5adfba55'
---

5013da3eac1b9eaa3e459e51868c972f35d13987