From: Koen Kooi <koen@openembedded.org>
Date: Fri, 25 Aug 2006 10:01:54 +0000 (+0000)
Subject: merge of '53526775d6ee970cc212293fcfa79e27b87e4a5b'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~159
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7458cd2416ed8b03406f065314ee7981ed61363f;p=openembedded.git

Merge ... '53526775d6ee970cc212293fcfa79e27b87e4a5b'
     and 'ded2a6ac420467a4e7a2e1324eec6ccf1037ab27'
---

7458cd2416ed8b03406f065314ee7981ed61363f