From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 13 Jan 2008 19:06:20 +0000 (+0000)
Subject: merge of '32b7fa94caf6c038558548e252b9c813f4bf0891'
X-Git-Tag: Release-2010-05/1~7938
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f01d81718cf3284e2757332a1b8eb3d5c60cf4f7;p=openembedded.git

Merge ... '32b7fa94caf6c038558548e252b9c813f4bf0891'
     and '51afccca79d0092ea2860950ddbfa96d1c141bb1'
---

f01d81718cf3284e2757332a1b8eb3d5c60cf4f7