From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 13 Jan 2007 13:37:18 +0000 (+0000)
Subject: merge of '5a3a0499fceb6465dab6ed321713520ddb11b854'
X-Git-Tag: Release-2010-05/1~9375
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f156a182e7f4be1ec4a17355a44a02283f0ba82c;p=openembedded.git

Merge ... '5a3a0499fceb6465dab6ed321713520ddb11b854'
     and 'eb2b566b24f4dd2148641b262bb2abd63431eb19'
---

f156a182e7f4be1ec4a17355a44a02283f0ba82c