From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 29 Jan 2008 23:41:05 +0000 (+0000)
Subject: merge of '013b42d9a596e92a85b2c13b49e8ce89c99c1b14'
X-Git-Tag: Release-2010-05/1~7807
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b11dc501a79f39bd62dfc60dbbccfdbc58828436;p=openembedded.git

Merge ... '013b42d9a596e92a85b2c13b49e8ce89c99c1b14'
     and 'a1e797708c3d5dd33d64905da2c778fc015eac9a'
---

b11dc501a79f39bd62dfc60dbbccfdbc58828436