From: Koen Kooi <koen@openembedded.org>
Date: Thu, 7 Aug 2008 11:14:47 +0000 (+0000)
Subject: merge of '5a2fb2965a905224af0a1e26d73f342ecf8944e8'
X-Git-Tag: Release-2010-05/1~6340
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9000ac7f4d6c3b230c1845b07725113c420b4981;p=openembedded.git

Merge ... '5a2fb2965a905224af0a1e26d73f342ecf8944e8'
     and '6fc6bb1fff3ea7b5546ddedf048c33f9a287ac15'
---

9000ac7f4d6c3b230c1845b07725113c420b4981