From: Daniel Willmann <daniel@totalueberwachung.de>
Date: Thu, 29 Nov 2007 20:10:20 +0000 (+0000)
Subject: merge of '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
X-Git-Tag: Release-2010-05/1~7890^2~2^2~6^2^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a2fba6940e3e07bc7613a431c99a6b7ed433588;p=openembedded.git

Merge ... '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
     and '812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee'
---

8a2fba6940e3e07bc7613a431c99a6b7ed433588