From: Koen Kooi <koen@openembedded.org>
Date: Thu, 19 Oct 2006 10:50:59 +0000 (+0000)
Subject: merge of '00032e7126f86cd85fcd04db2fbf6b89c2502be7'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~98^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72821c3c1e7ab4941e22f2809eb3d58b04b292a6;p=openembedded.git

Merge ... '00032e7126f86cd85fcd04db2fbf6b89c2502be7'
     and 'a0b62356b744396a4e9fc284292fa4df77a1a99e'
---

72821c3c1e7ab4941e22f2809eb3d58b04b292a6