From: Koen Kooi <koen@openembedded.org>
Date: Wed, 5 Dec 2007 08:30:47 +0000 (+0000)
Subject: merge of '4debfc11cf9e85b98e7395e221cb5044cf8fe49d'
X-Git-Tag: Release-2010-05/1~8220
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84e45797efabaf9db490763f312a1dab888bdb2e;p=openembedded.git

Merge ... '4debfc11cf9e85b98e7395e221cb5044cf8fe49d'
     and '7e45814ce1cb1ed4bb79fe646a4a5546cfa6a5e2'
---

84e45797efabaf9db490763f312a1dab888bdb2e