From: Daniel Willmann <daniel@totalueberwachung.de>
Date: Mon, 7 Jan 2008 23:45:57 +0000 (+0000)
Subject: merge of '88e2766fe8aa4c69dc8688e0554e2e6d05bb9c67'
X-Git-Tag: Release-2010-05/1~7890^2~2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bf5c3346ac395825d49f895922a61bcdbb238e5;p=openembedded.git

Merge ... '88e2766fe8aa4c69dc8688e0554e2e6d05bb9c67'
     and 'f556521018478109967b108bb830f8109aefbb0e'
---

1bf5c3346ac395825d49f895922a61bcdbb238e5