From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 12 Apr 2008 22:30:21 +0000 (+0000)
Subject: merge of 'a5ee0a152a133bdeb1576bb7a08fa9f1336e969d'
X-Git-Tag: Release-2010-05/1~7208
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb100bd3e661641cf870b3ffe8e5a9c52ec846b6;p=openembedded.git

Merge ... 'a5ee0a152a133bdeb1576bb7a08fa9f1336e969d'
     and 'a6bf1374bee35f1cd9cae388f5137b3d0647f2af'
---

cb100bd3e661641cf870b3ffe8e5a9c52ec846b6