From: Koen Kooi <koen@openembedded.org>
Date: Tue, 28 Nov 2006 20:42:51 +0000 (+0000)
Subject: merge of '15b6f45301fda6f790437001f9294ee5c0aa8b0b'
X-Git-Tag: Release-2010-05/1~9453^2~246
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=672985c8e00166b1baf44cbf4870303f3cda29e5;p=openembedded.git

Merge ... '15b6f45301fda6f790437001f9294ee5c0aa8b0b'
     and '229401407cd5205eaf63199ff76bf8ec83129101'
---

672985c8e00166b1baf44cbf4870303f3cda29e5