From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 12 Jun 2006 23:20:43 +0000 (+0000)
Subject: merge of 0733bfcfa824e0324d60f8ff76e749a1e93b5edd
X-Git-Tag: Release-2010-05/1~9453^2~1453^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03829814a583050e32ab8bcac2c0c5b5c04fc288;p=openembedded.git

merge of 0733bfcfa824e0324d60f8ff76e749a1e93b5edd
     and 270776af34e87c9cc517853ec60bf8d4f809496e
---

03829814a583050e32ab8bcac2c0c5b5c04fc288