From: Koen Kooi <koen@openembedded.org>
Date: Fri, 24 Aug 2007 13:17:54 +0000 (+0000)
Subject: merge of '0135b9c8cb83a5549aee08d6ce8638b76d8230a4'
X-Git-Tag: Release-2010-05/1~8794
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=778724cb7918c3cda2a2d23610a51dba58e7b6ba;p=openembedded.git

Merge ... '0135b9c8cb83a5549aee08d6ce8638b76d8230a4'
     and '340da43485a96531933592289a8115f52a246a86'
---

778724cb7918c3cda2a2d23610a51dba58e7b6ba