From: Koen Kooi <koen@openembedded.org>
Date: Fri, 11 May 2007 09:24:10 +0000 (+0000)
Subject: merge of '846cac1d65f36e1abe1166e8c149a74192ad56e7'
X-Git-Tag: Release-2010-05/1~8868^2~558^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=776bbf3da1ed47eee452b023d95aad99db7a3577;p=openembedded.git

Merge ... '846cac1d65f36e1abe1166e8c149a74192ad56e7'
     and 'd9ba9ec9ce6f5317b9b28dbd4e98e4cb52ecb6f6'
---

776bbf3da1ed47eee452b023d95aad99db7a3577