From: Koen Kooi <koen@openembedded.org>
Date: Thu, 2 Oct 2008 11:48:02 +0000 (+0000)
Subject: merge of '19314063bd11741e9ecbaaf39f836c03d4127357'
X-Git-Tag: Release-2010-05/1~5879
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdbfc51c061df4fad17a8ae942bc82e3b5b27e8d;p=openembedded.git

Merge ... '19314063bd11741e9ecbaaf39f836c03d4127357'
     and '3fdbb9ca8878cd328a406fdd3338f21ab71a3f3d'
---

bdbfc51c061df4fad17a8ae942bc82e3b5b27e8d