From: Daniel Willmann <daniel@totalueberwachung.de>
Date: Tue, 31 Jul 2007 11:19:12 +0000 (+0000)
Subject: merge of '3f578fcf74e37d012b104754e3387f72f82fa832'
X-Git-Tag: Release-2010-05/1~8868^2~64^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0db4f4a1cae982fda3d2c4c26c34671b1aeee5c;p=openembedded.git

Merge ... '3f578fcf74e37d012b104754e3387f72f82fa832'
     and 'aa90cc7b5525f5dcbe8d32593886404ea450d216'
---

f0db4f4a1cae982fda3d2c4c26c34671b1aeee5c