From: Robert Schuster <thebohemian@gmx.net>
Date: Thu, 14 Feb 2008 10:04:47 +0000 (+0000)
Subject: merge of 'aaa315ace8e5a65feb9e95d2a87bb19cf744b860'
X-Git-Tag: Release-2010-05/1~7696
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b100ea51727fdae3351fc7da279ea709bff7a48;p=openembedded.git

Merge ... 'aaa315ace8e5a65feb9e95d2a87bb19cf744b860'
     and 'd625decf5e60fa8f122af65024dbcaad6a1f0b19'
---

6b100ea51727fdae3351fc7da279ea709bff7a48