From: Daniel Willmann <daniel@totalueberwachung.de>
Date: Thu, 17 Jan 2008 19:23:03 +0000 (+0000)
Subject: merge of '15abe433106a3416f43fe1507eb0032a960434bb'
X-Git-Tag: Release-2010-05/1~7890^2~2^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f89da2c9521b9bff73a34b933929c1767c454ae;p=openembedded.git

Merge ... '15abe433106a3416f43fe1507eb0032a960434bb'
     and '2538d8c9c6f9647baba548394a1e20a2e4467a19'
---

5f89da2c9521b9bff73a34b933929c1767c454ae