From: Koen Kooi <koen@openembedded.org>
Date: Thu, 21 Jun 2007 10:14:48 +0000 (+0000)
Subject: merge of '7c69d6f82807a2236b393c167a2f687e6d31f479'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~33
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=236047df425af9f1b51bd9362b840b1f5c388e89;p=openembedded.git

Merge ... '7c69d6f82807a2236b393c167a2f687e6d31f479'
     and 'e89c096197c1edb468e2fa9e49482a06b639bf1e'
---

236047df425af9f1b51bd9362b840b1f5c388e89