From: Koen Kooi <koen@openembedded.org>
Date: Mon, 30 Jul 2007 11:31:03 +0000 (+0000)
Subject: merge of '21cc63203b5df2e8d90f0a909db0ffa185502b72'
X-Git-Tag: Release-2010-05/1~8868^2~76^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cca7de1567a0a1e6cedd31607ebd8700d0ef6ecd;p=openembedded.git

Merge ... '21cc63203b5df2e8d90f0a909db0ffa185502b72'
     and 'f87475ccf1fd18294a9edb79090422cc8f201753'
---

cca7de1567a0a1e6cedd31607ebd8700d0ef6ecd