From: Koen Kooi <koen@openembedded.org>
Date: Sat, 5 May 2007 21:48:57 +0000 (+0000)
Subject: merge of '25c9bf8030ed9b081cb15b534fe5dbd9bf20ad4e'
X-Git-Tag: Release-2010-05/1~8868^2~632
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc11ed6326881fa5726bd4430c0dc06da3e6e0b4;p=openembedded.git

Merge ... '25c9bf8030ed9b081cb15b534fe5dbd9bf20ad4e'
     and '30f2bd37e3e52038872a5a374ce62ae9b90855f6'
---

bc11ed6326881fa5726bd4430c0dc06da3e6e0b4