From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Sat, 22 Oct 2005 18:42:36 +0000 (+0000)
Subject: merge of 3e09771118f46dd5b429d9481e1be7f6a12628b8
X-Git-Tag: Release-2010-05/1~9453^2~3218
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ff7df445479e13c1cb8aaee4a3dc761a470249;p=openembedded.git

merge of 3e09771118f46dd5b429d9481e1be7f6a12628b8
     and c39d6bcb62a3013ec76c9d9c53de817504ff1a7e
---

f1ff7df445479e13c1cb8aaee4a3dc761a470249