From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 9 Jul 2008 15:31:44 +0000 (+0000)
Subject: merge of '7fb19ff722fe0f3e88a9d45230442af71ee72960'
X-Git-Tag: Release-2010-05/1~6546^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65bb1f64b7f7f300ac38c890e2980b95f88ccdde;p=openembedded.git

Merge ... '7fb19ff722fe0f3e88a9d45230442af71ee72960'
     and 'ae00760854aae829460c79c1907ca952c25f5a02'
---

65bb1f64b7f7f300ac38c890e2980b95f88ccdde