From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 7 Jul 2008 19:06:13 +0000 (+0000)
Subject: merge of '1e903c1b7aaf83f6d6191a71231f8862e397e14c'
X-Git-Tag: Release-2010-05/1~6546^2~28^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f73b34c676b7bb2864063b83174c07c9a29d7fb;p=openembedded.git

Merge ... '1e903c1b7aaf83f6d6191a71231f8862e397e14c'
     and 'da05681cb6f999dad9c83e628cb1825a48233318'
---

1f73b34c676b7bb2864063b83174c07c9a29d7fb