From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 12 Nov 2007 15:30:57 +0000 (+0000)
Subject: merge of '1eb5618e7a9c615ad27d9d1ed9285311c3a0e2cc'
X-Git-Tag: Release-2010-05/1~8419^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97165541f4f3bd7eae84e953e9cce7f3e1876b86;p=openembedded.git

Merge ... '1eb5618e7a9c615ad27d9d1ed9285311c3a0e2cc'
     and 'ace1edeb5a57c79c092da74aa3e679bf270021df'
---

97165541f4f3bd7eae84e953e9cce7f3e1876b86