From: Daniel Willmann <daniel@totalueberwachung.de>
Date: Sat, 29 Dec 2007 15:33:15 +0000 (+0000)
Subject: merge of 'ef09a721c7151f303afbf272139ccaa2a7837c95'
X-Git-Tag: Release-2010-05/1~7890^2~2^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=076ea19fcbce3d79d1809b74ad76c55e7a99454c;p=openembedded.git

Merge ... 'ef09a721c7151f303afbf272139ccaa2a7837c95'
     and 'f13cb61c97037453c70da8422448d96b08cfd5c9'
---

076ea19fcbce3d79d1809b74ad76c55e7a99454c