From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 8 Aug 2007 12:38:03 +0000 (+0000)
Subject: merge of '05cc5d66198a3d72159d333ad23069009f5c5cda'
X-Git-Tag: Release-2010-05/1~9076^2~4^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7f570b1865e28857a64294078ded7493f4c247d;p=openembedded.git

Merge ... '05cc5d66198a3d72159d333ad23069009f5c5cda'
     and '54fa1e3c0521ed472d0150900302a759edeb5c95'
---

f7f570b1865e28857a64294078ded7493f4c247d