From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 19 May 2008 00:19:25 +0000 (+0000)
Subject: merge of '5ffcacd9125004bbcb65a5f2d933272d313bee84'
X-Git-Tag: Release-2010-05/1~6886
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed8124e6f54fb0b1baa02bc443f1d4bf419bae35;p=openembedded.git

Merge ... '5ffcacd9125004bbcb65a5f2d933272d313bee84'
     and 'd78b6d9ef4e4f3d1ced7dfccfda038bcffbb221c'
---

ed8124e6f54fb0b1baa02bc443f1d4bf419bae35