From: Koen Kooi <koen@openembedded.org>
Date: Tue, 12 Dec 2006 14:14:13 +0000 (+0000)
Subject: merge of '34f6928a9e37b4cbcbf32f2d5a04ecf42a67b8dc'
X-Git-Tag: Release-2010-05/1~9453^2~171^2~9^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75d841fdcb14ec69dc70c7629718a5611914ba37;p=openembedded.git

Merge ... '34f6928a9e37b4cbcbf32f2d5a04ecf42a67b8dc'
     and '4f46377bcdabbb736ecf3eabda1271d12fccfcd1'
---

75d841fdcb14ec69dc70c7629718a5611914ba37