From: Koen Kooi <koen@openembedded.org>
Date: Thu, 29 Dec 2005 09:25:21 +0000 (+0000)
Subject: merge of 050c7f49109b8bf3ea8516bec1745c93a28a1b83
X-Git-Tag: Release-2010-05/1~9453^2~2833^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d27b92aaa3e609bd91464204be08877e42bb9ab6;p=openembedded.git

merge of 050c7f49109b8bf3ea8516bec1745c93a28a1b83
     and d5cad88ce1e757a9ebbac7f47c3c0e728e5a3482
---

d27b92aaa3e609bd91464204be08877e42bb9ab6