From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 30 Apr 2008 12:59:08 +0000 (+0000)
Subject: merge of 'b84aeb3b3fcb9975cdaaafccc4ecbc7ca61c5312'
X-Git-Tag: Release-2010-05/1~7079
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=164d14ccf62269636e0179140f24e551b04f9ca0;p=openembedded.git

Merge ... 'b84aeb3b3fcb9975cdaaafccc4ecbc7ca61c5312'
     and 'ff99add05b70c6e96f011a1a27dd980a5380a7bf'
---

164d14ccf62269636e0179140f24e551b04f9ca0