From: Koen Kooi <koen@openembedded.org>
Date: Tue, 28 Aug 2007 03:06:24 +0000 (+0000)
Subject: merge of '7f7e2abbafbc78c693195ccd3ecbc44742312157'
X-Git-Tag: Release-2010-05/1~8789^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d2c8ffba73f38f1f57e01e6387ac9ba848e5dd6;p=openembedded.git

Merge ... '7f7e2abbafbc78c693195ccd3ecbc44742312157'
     and 'a3a33729f3f0c0ad0c71c9872010fc1d7dd4f9ee'
---

6d2c8ffba73f38f1f57e01e6387ac9ba848e5dd6