From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 10 Oct 2008 14:27:44 +0000 (+0000)
Subject: merge of '3a46b29cc934022c7df085ba522531c57df6de56'
X-Git-Tag: Release-2010-05/1~5844
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=062a789c90b2a8410d0aa896f45f615e70700653;p=openembedded.git

Merge ... '3a46b29cc934022c7df085ba522531c57df6de56'
     and 'c3be7d35a09514cd7f28929bb60b9f7801d12c54'
---

062a789c90b2a8410d0aa896f45f615e70700653