From: Koen Kooi <koen@openembedded.org>
Date: Wed, 27 Aug 2008 13:19:23 +0000 (+0000)
Subject: merge of '045e00ff4301aa05fddab174a3ac5bf9c260343b'
X-Git-Tag: Release-2010-05/1~6228
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f05854e89327463f009e47cad7ed61bd228fb7e9;p=openembedded.git

Merge ... '045e00ff4301aa05fddab174a3ac5bf9c260343b'
     and '90204f8950d2ea5d6cc182ba36902a2e41bdfc7e'
---

f05854e89327463f009e47cad7ed61bd228fb7e9