From: Koen Kooi <koen@openembedded.org>
Date: Sun, 18 May 2008 12:00:22 +0000 (+0000)
Subject: merge of '860bccc90a045f54a0fd143d4759959d43643350'
X-Git-Tag: Release-2010-05/1~6898
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24afb9966c4337bb3fe66fb42bb5cc845e2ab212;p=openembedded.git

Merge ... '860bccc90a045f54a0fd143d4759959d43643350'
     and 'd0e6322f95c05a9799955013d3c7dba65d4cc401'
---

24afb9966c4337bb3fe66fb42bb5cc845e2ab212