From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Thu, 22 Nov 2007 21:15:54 +0000 (+0000)
Subject: merge of '01a1687d6a3a1aa8b8ba912066a682526987fd4f'
X-Git-Tag: Release-2010-05/1~8305^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=255eeb9dd1af98857dc30631076bb4fae8da4e0c;p=openembedded.git

Merge ... '01a1687d6a3a1aa8b8ba912066a682526987fd4f'
     and '74f9f9386f21c9cc7120b518b57aa3e7dee84477'
---

255eeb9dd1af98857dc30631076bb4fae8da4e0c