From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 27 Jul 2008 16:46:17 +0000 (+0000)
Subject: merge of '9dc7779dad5b6a6762c08a60de1c3cba24575356'
X-Git-Tag: Release-2010-05/1~6449^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e43272f0388c76449c6b4b04c6e84fada2fe55b;p=openembedded.git

Merge ... '9dc7779dad5b6a6762c08a60de1c3cba24575356'
     and 'a08c13e1d6c50600fb85844f3940034870cd26ad'
---

6e43272f0388c76449c6b4b04c6e84fada2fe55b