From: Koen Kooi <koen@openembedded.org>
Date: Fri, 8 Aug 2008 13:05:14 +0000 (+0000)
Subject: merge of '26ec78f4f59453ecd4343ab4c92d4787ab5a81fe'
X-Git-Tag: Release-2010-05/1~6333^2~59
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69990468b9e9828532b42e15896c671d246fe764;p=openembedded.git

Merge ... '26ec78f4f59453ecd4343ab4c92d4787ab5a81fe'
     and '33f3d0a7c4cbdff4e2348d37b7add06e6c261f0e'
---

69990468b9e9828532b42e15896c671d246fe764