From: Koen Kooi <koen@openembedded.org>
Date: Tue, 22 Jul 2008 09:19:33 +0000 (+0000)
Subject: merge of '25f2070b6ff7c016172c18ddcbea754aeb7d159e'
X-Git-Tag: Release-2010-05/1~6505
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ae90485f3dbfeddba93e7904d6cfbc89d53fe5d;p=openembedded.git

Merge ... '25f2070b6ff7c016172c18ddcbea754aeb7d159e'
     and '719f01c7bedccc565279537ecbfdbf8a61bd9a4b'
---

4ae90485f3dbfeddba93e7904d6cfbc89d53fe5d