From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 8 Jul 2008 12:46:01 +0000 (+0000)
Subject: merge of '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
X-Git-Tag: Release-2010-05/1~6562^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1a30ab11ddf21a93e41a404e95c84cd1503f0e4;p=openembedded.git

Merge ... '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
     and 'fd2e08736e0fe9e7ddd372595adb5f733bc2ca19'
---

b1a30ab11ddf21a93e41a404e95c84cd1503f0e4