From: Koen Kooi <koen@openembedded.org>
Date: Sun, 4 Feb 2007 11:14:02 +0000 (+0000)
Subject: merge of '29f34b6c27e10d81f001d11a5e9ab29d1e915ffd'
X-Git-Tag: Release-2010-05/1~9298
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f1aca31ac446635ff1b452f4f114fe2bd9718e8;p=openembedded.git

Merge ... '29f34b6c27e10d81f001d11a5e9ab29d1e915ffd'
     and 'e1bf125b596e0dbb381f6cc4ea272fcd16c78199'
---

3f1aca31ac446635ff1b452f4f114fe2bd9718e8