From: Koen Kooi <koen@openembedded.org>
Date: Sat, 7 Apr 2007 20:50:28 +0000 (+0000)
Subject: merge of '13364d2be993b3a7913d2159c9b8514e52893b4a'
X-Git-Tag: Release-2010-05/1~8868^2~746^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=825674e5fc178a9a7f0becfa7b6ebf71a5106023;p=openembedded.git

Merge ... '13364d2be993b3a7913d2159c9b8514e52893b4a'
     and '185ce7e23b283d430a101c7e4df3f38562a67271'
---

825674e5fc178a9a7f0becfa7b6ebf71a5106023