From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 13 Jan 2006 22:50:24 +0000 (+0000)
Subject: merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
X-Git-Tag: Release-2010-05/1~9453^2~2663^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7896470157b166dcceee2fc8a513e125fb73ec45;p=openembedded.git

merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
     and e118e6eeb9d00fb7d7577c8cfdea6ed409fdc2a9
---

7896470157b166dcceee2fc8a513e125fb73ec45