From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 18 May 2008 18:03:31 +0000 (+0000)
Subject: explicit merge of '3690cf9a949f76acaa2b247794d6ee00339acd46'
X-Git-Tag: Release-2010-05/1~6892^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fe0c139e1c937056b026e592083392fd7fa1944;p=openembedded.git

explicit merge of '3690cf9a949f76acaa2b247794d6ee00339acd46'
              and 'f2497299e919cb94e12fc8690a709479451e5510'
---

9fe0c139e1c937056b026e592083392fd7fa1944