From: Koen Kooi <koen@openembedded.org>
Date: Wed, 10 Oct 2007 09:15:35 +0000 (+0000)
Subject: merge of '3ab13564266d48c610004a9570479df65c0ee659'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~104^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=288c0fb960bdb5f6e58cf0f67ab197744fd08aec;p=openembedded.git

Merge ... '3ab13564266d48c610004a9570479df65c0ee659'
     and '5ac8d930d208290aa8f5f13dd67120ed845441ed'
---

288c0fb960bdb5f6e58cf0f67ab197744fd08aec