From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 3 Aug 2006 18:31:31 +0000 (+0000)
Subject: merge of b3e86370942ae81e42661d50c1440b905d9b3b5b
X-Git-Tag: Release-2010-05/1~9453^2~1012
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aea055157aed744658bfebd73cbe4490d0fe2650;p=openembedded.git

merge of b3e86370942ae81e42661d50c1440b905d9b3b5b
     and f14e35813d5a67a7c6363eebc51916ea9c57c668
---

aea055157aed744658bfebd73cbe4490d0fe2650