From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 5 Nov 2007 14:00:27 +0000 (+0000)
Subject: merge of '1eb03bbc471949379b938272d92c72d53e7dbd66'
X-Git-Tag: Release-2010-05/1~8454^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a7dc7e9187c9b9f9d76354b5092acb9941fbeb;p=openembedded.git

Merge ... '1eb03bbc471949379b938272d92c72d53e7dbd66'
     and '834b1d3768e14c34c382aac26ffc80848dc8c213'
---

e3a7dc7e9187c9b9f9d76354b5092acb9941fbeb