From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 28 Mar 2008 15:07:35 +0000 (+0000)
Subject: merge of '13170805eb277bcec085eb013dda836930e5bee7'
X-Git-Tag: Release-2010-05/1~7258^2^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aae834760ee0eb60cfa60353ad09c6b6431acee4;p=openembedded.git

Merge ... '13170805eb277bcec085eb013dda836930e5bee7'
     and 'd2c1007682618105ff49ee76ac59d9b164de9572'
---

aae834760ee0eb60cfa60353ad09c6b6431acee4