From: Koen Kooi <koen@openembedded.org>
Date: Sat, 2 Aug 2008 14:58:39 +0000 (+0000)
Subject: merge of 'a675a323523cfdb282fa64bd2a0e42d19d71db33'
X-Git-Tag: Release-2010-05/1~6387
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7c3d88c18c722a4dfd1e5717f67f90a2ae6f3ce;p=openembedded.git

Merge ... 'a675a323523cfdb282fa64bd2a0e42d19d71db33'
     and 'b67dfab13ef7114048f172a8cce5a15a5e2f5b07'
---

d7c3d88c18c722a4dfd1e5717f67f90a2ae6f3ce