From: Koen Kooi <koen@openembedded.org>
Date: Mon, 3 Dec 2007 15:49:58 +0000 (+0000)
Subject: merge of '0573649abd1cf5b9f42a282ceefd2a99912dae21'
X-Git-Tag: Release-2010-05/1~8236^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed26aba10100117676b1c2beff72c3e07ea7c2ed;p=openembedded.git

Merge ... '0573649abd1cf5b9f42a282ceefd2a99912dae21'
     and 'a5835e350969f436aec7b4c92890a1e73dcd6c3e'
---

ed26aba10100117676b1c2beff72c3e07ea7c2ed