From: Daniel Willmann <daniel@totalueberwachung.de>
Date: Sun, 23 Dec 2007 11:34:37 +0000 (+0000)
Subject: merge of '7b528e427242c4fc04839c0b8e3f065248b5c0dc'
X-Git-Tag: Release-2010-05/1~7890^2~2^2~6^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=504661aa0fc08e8bd47a8409bb61f8e340ba6eaa;p=openembedded.git

Merge ... '7b528e427242c4fc04839c0b8e3f065248b5c0dc'
     and 'd8bfa63aa913e7227790ba2d02253cfbecce61ab'
---

504661aa0fc08e8bd47a8409bb61f8e340ba6eaa