From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Sep 2007 15:24:20 +0000 (+0000)
Subject: merge of '7bb175794c76c6b9b785835fe714b7e4e489206c'
X-Git-Tag: Release-2010-05/1~8652
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fdd16a6b444667fccaca4e49692dc93d0ff9ea9;p=openembedded.git

Merge ... '7bb175794c76c6b9b785835fe714b7e4e489206c'
     and 'e22359507956c45e7ed998bce3e90f6db8c81ecf'
---

1fdd16a6b444667fccaca4e49692dc93d0ff9ea9