From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Wed, 4 Jun 2008 10:24:28 +0000 (+0000)
Subject: merge of '8a346ac0cb1c268bff470b0f2784075ba7eaea0b'
X-Git-Tag: Release-2010-05/1~6832
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=593cd2cbadb3997a5bfaca17d4b751214d8d2b92;p=openembedded.git

Merge ... '8a346ac0cb1c268bff470b0f2784075ba7eaea0b'
     and '9dee7a8725dc7dc8f9882b09eee3fe13e9ab8eac'
---

593cd2cbadb3997a5bfaca17d4b751214d8d2b92