From: Koen Kooi <koen@openembedded.org>
Date: Wed, 28 Feb 2007 19:15:56 +0000 (+0000)
Subject: merge of '8f6b66511e35bbf7f98fd72d6d67545037684189'
X-Git-Tag: Release-2010-05/1~9133^2~14^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17ea06b9a7c10204e2042e6bd7784983e5df96ed;p=openembedded.git

Merge ... '8f6b66511e35bbf7f98fd72d6d67545037684189'
     and 'ff5998e440b2ce8a6f42769e187a556120142af8'
---

17ea06b9a7c10204e2042e6bd7784983e5df96ed