From: Koen Kooi <koen@openembedded.org>
Date: Thu, 25 Sep 2008 12:37:36 +0000 (+0000)
Subject: merge of '2ae98c73d0708cb2d224fbf130a90805e19503ee'
X-Git-Tag: Release-2010-05/1~5972
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ead4e5a8182144ef31d860371ab56be82860536c;p=openembedded.git

Merge ... '2ae98c73d0708cb2d224fbf130a90805e19503ee'
     and '9b5a0eebc140a11b64876ab88fc1ca50059ff6fa'
---

ead4e5a8182144ef31d860371ab56be82860536c