From: Koen Kooi <koen@openembedded.org>
Date: Wed, 29 Nov 2006 19:27:16 +0000 (+0000)
Subject: merge of 'ad36a7c0dc09029ac7c1a503d76ef1f5ca0600e0'
X-Git-Tag: Release-2010-05/1~9453^2~222
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f9387ad289cf63da20ad7fdabe46b34f38543d6;p=openembedded.git

Merge ... 'ad36a7c0dc09029ac7c1a503d76ef1f5ca0600e0'
     and 'dc872c264d1153f23f3441b4facbe53338c1f142'
---

0f9387ad289cf63da20ad7fdabe46b34f38543d6