From: Daniel Willmann <daniel@totalueberwachung.de>
Date: Thu, 3 Jan 2008 14:37:37 +0000 (+0000)
Subject: merge of '274270bd49f45e5d154a09560078fd8473cebef3'
X-Git-Tag: Release-2010-05/1~7890^2~2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22a6de3cdd938ecd144efec7e912cb7fa20debe6;p=openembedded.git

Merge ... '274270bd49f45e5d154a09560078fd8473cebef3'
     and 'd12a899d666597c4750ce96df9085900d2d639c7'
---

22a6de3cdd938ecd144efec7e912cb7fa20debe6