From: Robert Schuster <thebohemian@gmx.net>
Date: Fri, 10 Oct 2008 14:47:38 +0000 (+0000)
Subject: merge of '3a46b29cc934022c7df085ba522531c57df6de56'
X-Git-Tag: Release-2010-05/1~5842^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22daad61fa11c387f78a1c6852bf8d812c835c88;p=openembedded.git

Merge ... '3a46b29cc934022c7df085ba522531c57df6de56'
     and 'b1dff4fe794bb68455321c0742b9a83e38afa5b3'
---

22daad61fa11c387f78a1c6852bf8d812c835c88