From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 19 Aug 2007 17:32:08 +0000 (+0000)
Subject: merge of '33d36c3f90d3f3338d861f53c982c88ecc127201'
X-Git-Tag: Release-2010-05/1~8891^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a17103f83b66b0280dc02a6f8d1d9c17b9979c6;p=openembedded.git

Merge ... '33d36c3f90d3f3338d861f53c982c88ecc127201'
     and '4fe73431c4f4506a83505d3043fbedb9763f1983'
---

9a17103f83b66b0280dc02a6f8d1d9c17b9979c6