From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Tue, 20 May 2008 20:23:12 +0000 (+0000)
Subject: merge of '635b19191517f99ee151ae6157a22f5d56406238'
X-Git-Tag: Release-2010-05/1~6882^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8e3cbb7e1ae86507b7cfd8142be8a1e7323270f;p=openembedded.git

Merge ... '635b19191517f99ee151ae6157a22f5d56406238'
     and 'c179e5e451e08eb1f3266b4da027de66abad7a9b'
---

d8e3cbb7e1ae86507b7cfd8142be8a1e7323270f