From: Koen Kooi <koen@openembedded.org>
Date: Mon, 14 Jul 2008 08:39:13 +0000 (+0000)
Subject: merge of '45d7f2962e16b25cf29da125c1645096b5d7fe7e'
X-Git-Tag: Release-2010-05/1~6543^2~7^2~32^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bb6810f0190c114aac654627547808b3f301fab;p=openembedded.git

Merge ... '45d7f2962e16b25cf29da125c1645096b5d7fe7e'
     and 'aa0f52125342f4a172e931fd7a8aa4d951d9f7ec'
---

1bb6810f0190c114aac654627547808b3f301fab