From: Koen Kooi <koen@openembedded.org>
Date: Tue, 1 Nov 2005 11:42:07 +0000 (+0000)
Subject: merge of 3ac4779a56bf9130aadc5166d793c061e945e4eb
X-Git-Tag: Release-2010-05/1~9453^2~3155^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fee99744755aec67f7fa3b3d6516e4ab643d57d;p=openembedded.git

merge of 3ac4779a56bf9130aadc5166d793c061e945e4eb
     and e90052e869148cbad322c7a3e0db7ff65b671002
---

1fee99744755aec67f7fa3b3d6516e4ab643d57d