From: Koen Kooi <koen@openembedded.org>
Date: Mon, 4 Aug 2008 13:15:27 +0000 (+0000)
Subject: merge of '1ebb8320b743c004de3edbcfb17ea43a7cfbe6b2'
X-Git-Tag: Release-2010-05/1~6365^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=810fb5eba6f2e57ce61b96361fb3445aac331ddf;p=openembedded.git

Merge ... '1ebb8320b743c004de3edbcfb17ea43a7cfbe6b2'
     and '5f904f7a12f760543efbb50eed318ac4e50f6558'
---

810fb5eba6f2e57ce61b96361fb3445aac331ddf