From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 17 Nov 2007 15:13:09 +0000 (+0000)
Subject: merge of '1e012394e595723b164ab2ffb09c796f3acc427f'
X-Git-Tag: Release-2010-05/1~8371
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=305088ed5cac5103ccc3b03087a2dc8cf02debcc;p=openembedded.git

Merge ... '1e012394e595723b164ab2ffb09c796f3acc427f'
     and 'c6aac16390922aff6ad90c5bbf729c79ece62df3'
---

305088ed5cac5103ccc3b03087a2dc8cf02debcc