From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 27 Jul 2008 21:55:44 +0000 (+0000)
Subject: merge of '5a21ce3f8925a2f59922f56157e689a0b3da0ae7'
X-Git-Tag: Release-2010-05/1~6449^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f13b1a3dcbcfbc9c696051920e51425ed44b269c;p=openembedded.git

Merge ... '5a21ce3f8925a2f59922f56157e689a0b3da0ae7'
     and '5bb4bd3c22bd1d7fbf5eb23c0423846435ca5e06'
---

f13b1a3dcbcfbc9c696051920e51425ed44b269c