From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Fri, 18 Jul 2008 12:47:56 +0000 (+0000)
Subject: merge of '7ddcf7aeb14743db7aec16e7be026e81dd7d1b38'
X-Git-Tag: Release-2010-05/1~6541
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=987a1cc1478c2455224169f320766f42d0dc890e;p=openembedded.git

Merge ... '7ddcf7aeb14743db7aec16e7be026e81dd7d1b38'
     and '833293633b1a1f924ee4ba4f8e442c032d9cd133'
---

987a1cc1478c2455224169f320766f42d0dc890e