From: Matthias Hentges <oe@hentges.net>
Date: Sat, 20 May 2006 08:54:31 +0000 (+0000)
Subject: merge of 03fd4d06deb0ac1de761650c03d3b56f3d217c49
X-Git-Tag: Release-2010-05/1~9453^2~1632^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=229b799c419f274c7aa3fc537f1cc74d291aaf0f;p=openembedded.git

merge of 03fd4d06deb0ac1de761650c03d3b56f3d217c49
     and 46c1cdea7bf65d8ba6bbe951e7408d24d5b05d06
---

229b799c419f274c7aa3fc537f1cc74d291aaf0f