From: Koen Kooi <koen@openembedded.org>
Date: Sun, 13 Jul 2008 13:05:20 +0000 (+0000)
Subject: merge of 'dea5fd7f1b27baf261b5d668733d4ab001554649'
X-Git-Tag: Release-2010-05/1~6543^2~7^2~32^2~12^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab2995c706c3c32b2002196d43bbfbecca6707df;p=openembedded.git

Merge ... 'dea5fd7f1b27baf261b5d668733d4ab001554649'
     and 'e0f1f9bc5dd648488bd0c935a9b9ee33a518f15d'
---

ab2995c706c3c32b2002196d43bbfbecca6707df