From: Koen Kooi <koen@openembedded.org>
Date: Wed, 4 Jun 2008 09:43:40 +0000 (+0000)
Subject: merge of '53e608aeb23095887be63ad8796f84461a850a1b'
X-Git-Tag: Release-2010-05/1~6832^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b55839a615f3e9ad62224e5f6236009ef936423f;p=openembedded.git

Merge ... '53e608aeb23095887be63ad8796f84461a850a1b'
     and 'd2747ed616c9b8d91ec15a38b2ed5183e011220e'
---

b55839a615f3e9ad62224e5f6236009ef936423f