From: Koen Kooi <koen@openembedded.org>
Date: Sat, 14 Jun 2008 18:03:44 +0000 (+0000)
Subject: merge of '23094adbbe1c0cf4e6533536f3d839d77e1e5bbf'
X-Git-Tag: Release-2010-05/1~6691
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eececf1f8f38a4fcaff2ed778a39bddecf6ae18;p=openembedded.git

Merge ... '23094adbbe1c0cf4e6533536f3d839d77e1e5bbf'
     and 'e52349bdf770c1441b7661f55056b3cf08ffe21e'
---

3eececf1f8f38a4fcaff2ed778a39bddecf6ae18