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

Merge ... 'ad95f08d419bba954eab21c0d4ef155b70f86dbc'
     and 'eeb3a83ad8d45d4069e1ae9170eb852a6bb31d43'
---

fe379ffc9b1b75ba62a68f5bc21b854e5da49259