From: Robert Schuster <thebohemian@gmx.net>
Date: Tue, 16 Sep 2008 13:17:00 +0000 (+0000)
Subject: merge of '25b373bd9d80f07fcb709bdf80c6683debe5e46c'
X-Git-Tag: Release-2010-05/1~6086
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13584794aa17220184210254868ceceb39a8136d;p=openembedded.git

Merge ... '25b373bd9d80f07fcb709bdf80c6683debe5e46c'
     and '9ba4295a48a42020cb433b5bca58e7fb702432d9'
---

13584794aa17220184210254868ceceb39a8136d