From: Koen Kooi <koen@openembedded.org>
Date: Sat, 13 Oct 2007 17:59:57 +0000 (+0000)
Subject: merge of '873da0372ff3245a206abda6731109ceff7fda5a'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~71
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2cbf130ba5be2e7b8655c63e7f2a3acf995f05;p=openembedded.git

Merge ... '873da0372ff3245a206abda6731109ceff7fda5a'
     and 'b7fa0aff3156da49cf51f8356ad60d91a84ac274'
---

de2cbf130ba5be2e7b8655c63e7f2a3acf995f05