From: Koen Kooi <koen@openembedded.org>
Date: Tue, 31 Jul 2007 08:47:59 +0000 (+0000)
Subject: merge of '3ec7cab836f802bb1b737eb375a0d1422ea5099b'
X-Git-Tag: Release-2010-05/1~8868^2~64^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05314ecd8854d512bb52e861bbfa1153844c3255;p=openembedded.git

Merge ... '3ec7cab836f802bb1b737eb375a0d1422ea5099b'
     and 'f0acec47ef997751817df5f6b967a73fec86904a'
---

05314ecd8854d512bb52e861bbfa1153844c3255