From: Koen Kooi <koen@openembedded.org>
Date: Sat, 11 Nov 2006 20:32:53 +0000 (+0000)
Subject: merge of '0c748e1d7bac1a47ec910c7acdb38a694ca28999'
X-Git-Tag: Release-2010-05/1~9453^2~481^2^2~21^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3365c434187111a1e173d0d1aa7d59be50fe71ae;p=openembedded.git

Merge ... '0c748e1d7bac1a47ec910c7acdb38a694ca28999'
     and '2514e90184801c096284ce7869e8eb95ddf3a9db'
---

3365c434187111a1e173d0d1aa7d59be50fe71ae