From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 12 Jan 2008 15:22:59 +0000 (+0000)
Subject: merge of '3f5863be74aaf18d9f78fd1e075d3203cc282bdc'
X-Git-Tag: Release-2010-05/1~7948^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3708f93a45a862ad2d104dbb5c864d34876be0c2;p=openembedded.git

Merge ... '3f5863be74aaf18d9f78fd1e075d3203cc282bdc'
     and 'eaee5612742a446def8bdaaa5b89c3cc8047332e'
---

3708f93a45a862ad2d104dbb5c864d34876be0c2