From: Koen Kooi <koen@openembedded.org>
Date: Tue, 5 Dec 2006 12:31:36 +0000 (+0000)
Subject: merge of '77bf6cf9356d5ff7595faaf06c5e8138020cb353'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a94fdbbd406c6583ff9fceb1a19206ba376784a;p=openembedded.git

Merge ... '77bf6cf9356d5ff7595faaf06c5e8138020cb353'
     and '9a127619747044880301661798d91082df6b5d72'
---

0a94fdbbd406c6583ff9fceb1a19206ba376784a