From: Koen Kooi <koen@openembedded.org>
Date: Mon, 6 Aug 2007 12:08:02 +0000 (+0000)
Subject: merge of '611bfe4d6e620cea4d216e318144b7394bd7d322'
X-Git-Tag: Release-2010-05/1~8868^2~1^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb287568516bde979215aa9860b92fd8e93e1ae4;p=openembedded.git

Merge ... '611bfe4d6e620cea4d216e318144b7394bd7d322'
     and '75c7809d53aac42fe9ec7942504b4d2b1a89081d'
---

fb287568516bde979215aa9860b92fd8e93e1ae4