From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 Jan 2007 00:06:07 +0000 (+0000)
Subject: merge of 'c0e1d74b2a331789caaf72b458b57924d21c7da3'
X-Git-Tag: Release-2010-05/1~9453^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=981fbc289052da6ea4559025c6f21d153947d12c;p=openembedded.git

Merge ... 'c0e1d74b2a331789caaf72b458b57924d21c7da3'
     and 'cc1b4154bcb4fcf73ff9107d9423b76123ad5528'
---

981fbc289052da6ea4559025c6f21d153947d12c