From: Koen Kooi <koen@openembedded.org>
Date: Fri, 20 Oct 2006 13:15:17 +0000 (+0000)
Subject: merge of 'ba75ce699520265ea15b201913787870af7e0572'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~71^2~4^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1e0f23576174cb4134b28deb3f2eca47bb86bb8;p=openembedded.git

Merge ... 'ba75ce699520265ea15b201913787870af7e0572'
     and 'f535484a11d9a7f9de067f6f66a12a8e321e6a0b'
---

a1e0f23576174cb4134b28deb3f2eca47bb86bb8