From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 Sep 2008 14:00:39 +0000 (+0000)
Subject: merge of '2d574b396363dc4b0725e8562582f359dc3f9e9e'
X-Git-Tag: Release-2010-05/1~6173^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eef34c2e56094d0485949e80b7909a0e76038af9;p=openembedded.git

Merge ... '2d574b396363dc4b0725e8562582f359dc3f9e9e'
     and 'dfb479cddb09f499a866399e04bdf6015048f98a'
---

eef34c2e56094d0485949e80b7909a0e76038af9