From: Robert Schuster <thebohemian@gmx.net>
Date: Fri, 6 Jun 2008 13:25:19 +0000 (+0000)
Subject: merge of 'ba2394dc8bed77043b229f3e5c42b4b69aeca918'
X-Git-Tag: Release-2010-05/1~6618^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c546ffe731c5f61da2b1d43286697224a2a27d8;p=openembedded.git

Merge ... 'ba2394dc8bed77043b229f3e5c42b4b69aeca918'
     and 'e8b3409511829c8c35d2859b5756d0206fbb3016'
---

3c546ffe731c5f61da2b1d43286697224a2a27d8