From: Koen Kooi <koen@openembedded.org>
Date: Sun, 13 Nov 2005 21:08:54 +0000 (+0000)
Subject: merge of 2d0c6c5ae9de1c7f719379b1be47dc565de60d41
X-Git-Tag: Release-2010-05/1~9453^2~3083^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d395e29b768d1df8dfd55fe1fcfa5890a4f2db5;p=openembedded.git

merge of 2d0c6c5ae9de1c7f719379b1be47dc565de60d41
     and 81893f6385397851b77ac4dab982e8f0ae5a9198
---

3d395e29b768d1df8dfd55fe1fcfa5890a4f2db5