From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 25 Jun 2008 16:14:42 +0000 (+0000)
Subject: merge of '5ebc68ac23faeb96effdf4f594c20c57c3f1ab5c'
X-Git-Tag: Release-2010-05/1~6619^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f88892c45fee76e94909c22b460732ae2ac3b9f;p=openembedded.git

Merge ... '5ebc68ac23faeb96effdf4f594c20c57c3f1ab5c'
     and '85a1e5d843207f3fcf6f1043a822a543e89cc938'
---

4f88892c45fee76e94909c22b460732ae2ac3b9f