From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 4 Dec 2007 18:06:56 +0000 (+0000)
Subject: merge of '96d7870254b4856e54bb9917bf206a20c8a2143b'
X-Git-Tag: Release-2010-05/1~8228
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b273dfd5fd8f6e2863e38d7fd245b10b29a4a3d;p=openembedded.git

Merge ... '96d7870254b4856e54bb9917bf206a20c8a2143b'
     and 'af1fa1ff21fbbd82c0b12c754f37cc126ee70b06'
---

5b273dfd5fd8f6e2863e38d7fd245b10b29a4a3d