From: Koen Kooi <koen@openembedded.org>
Date: Tue, 12 Aug 2008 14:26:28 +0000 (+0000)
Subject: merge of '3c5eeab152463150e763af8e2364e135eabc995b'
X-Git-Tag: Release-2010-05/1~6333^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b99a9f05a0a96c3e3b631f576a5a84dd2767fc62;p=openembedded.git

Merge ... '3c5eeab152463150e763af8e2364e135eabc995b'
     and '927230fdadc85c2a14f2f4ee848fe29c94d9ffe1'
---

b99a9f05a0a96c3e3b631f576a5a84dd2767fc62