From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 16 Apr 2006 14:40:35 +0000 (+0000)
Subject: merge of b2aabdd1853c4273f9ce3ab3d26acd034460ec1c
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~113
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b401918bd78e60ad141176d87b452440ae1f3050;p=openembedded.git

merge of b2aabdd1853c4273f9ce3ab3d26acd034460ec1c
     and dcff2c4c5128ab25e2593ca84778d2a405fb7cb3
---

b401918bd78e60ad141176d87b452440ae1f3050