From: Koen Kooi <koen@openembedded.org>
Date: Fri, 22 Aug 2008 15:47:12 +0000 (+0000)
Subject: merge of '2df98cb93e1c3ab67c675e3f11ef036ea57dd19b'
X-Git-Tag: Release-2010-05/1~6288^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3c74f6b708586d0a996daae1fa8b5ffa3b25cb6;p=openembedded.git

Merge ... '2df98cb93e1c3ab67c675e3f11ef036ea57dd19b'
     and 'ba9a800ebd8fd6f90db1e022cd9a342c69339bc2'
---

f3c74f6b708586d0a996daae1fa8b5ffa3b25cb6