From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 13 Feb 2008 17:22:03 +0000 (+0000)
Subject: merge of 'bee9775a7c7c9473463045701aaa9f372e1173ce'
X-Git-Tag: Release-2010-05/1~7686^2~3^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e1885864131228640a0e2f4b0fd5fba72df00e1;p=openembedded.git

Merge ... 'bee9775a7c7c9473463045701aaa9f372e1173ce'
     and 'e65ed9e5ef27495a6e0a27b271aaeb16c87cc317'
---

5e1885864131228640a0e2f4b0fd5fba72df00e1